From 4114a2bbe86308d242f80582991c62ed5f47c00b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 26 Jul 2021 15:08:29 +0200 Subject: [PATCH] CMake: chase renamed YAMLCPP --- src/calamares/CMakeLists.txt | 2 +- src/libcalamares/CMakeLists.txt | 4 ++-- src/libcalamaresui/CMakeLists.txt | 2 +- src/modules/contextualprocess/CMakeLists.txt | 2 +- src/modules/fsresizer/CMakeLists.txt | 2 +- src/modules/hostinfo/CMakeLists.txt | 2 +- src/modules/initcpio/CMakeLists.txt | 2 +- src/modules/initramfs/CMakeLists.txt | 2 +- src/modules/locale/CMakeLists.txt | 2 +- src/modules/shellprocess/CMakeLists.txt | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index abea69a26..cf00dca37 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -123,5 +123,5 @@ if( BUILD_TESTING ) target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui ) add_executable( test_conf test_conf.cpp ) - target_link_libraries( test_conf PUBLIC yamlcpp Qt5::Core ) + target_link_libraries( test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core ) endif() diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 8e46a9453..2f542450b 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -160,7 +160,7 @@ target_link_libraries( calamares LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES} LINK_PUBLIC - yamlcpp + yamlcpp::yamlcpp Qt5::Core KF5::CoreAddons ${OPTIONAL_PUBLIC_LIBRARIES} @@ -315,7 +315,7 @@ calamares_add_test( # This is not an actual test, it's a test / demo application # for experimenting with GeoIP. add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) -target_link_libraries( test_geoip calamares Qt5::Network yamlcpp ) +target_link_libraries( test_geoip calamares Qt5::Network yamlcpp::yamlcpp ) calamares_automoc( test_geoip ) if ( Qt5DBus_FOUND ) diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index a7c6e7906..20fae9a19 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -76,7 +76,7 @@ calamares_add_library( calamaresui EXPORT Calamares VERSION ${CALAMARES_VERSION_SHORT} ) -target_link_libraries( calamaresui PRIVATE yamlcpp ) +target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp ) if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 ) target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease ) endif() diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt index 0798407ab..d7716bbfb 100644 --- a/src/modules/contextualprocess/CMakeLists.txt +++ b/src/modules/contextualprocess/CMakeLists.txt @@ -17,5 +17,5 @@ calamares_add_test( Tests.cpp ContextualProcessJob.cpp # Builds it a second time LIBRARIES - yamlcpp + yamlcpp::yamlcpp ) diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt index 6e9a87907..e721d7f6b 100644 --- a/src/modules/fsresizer/CMakeLists.txt +++ b/src/modules/fsresizer/CMakeLists.txt @@ -31,7 +31,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND Tests.cpp LIBRARIES calamares_job_fsresizer # From above - yamlcpp + yamlcpp::yamlcpp DEFINITIONS ${KPMcore_API_DEFINITIONS} ) else() diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt index 8ceae0798..55be66f81 100644 --- a/src/modules/hostinfo/CMakeLists.txt +++ b/src/modules/hostinfo/CMakeLists.txt @@ -42,5 +42,5 @@ calamares_add_test( Tests.cpp HostInfoJob.cpp LIBRARIES - yamlcpp + yamlcpp::yamlcpp ) diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt index d4b4e8b43..48fd09371 100644 --- a/src/modules/initcpio/CMakeLists.txt +++ b/src/modules/initcpio/CMakeLists.txt @@ -17,5 +17,5 @@ calamares_add_test( Tests.cpp LIBRARIES calamares_job_initcpio # From above - yamlcpp + yamlcpp::yamlcpp ) diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt index 9937b7fb4..2dec41cba 100644 --- a/src/modules/initramfs/CMakeLists.txt +++ b/src/modules/initramfs/CMakeLists.txt @@ -17,5 +17,5 @@ calamares_add_test( Tests.cpp LIBRARIES calamares_job_initramfs # From above - yamlcpp + yamlcpp::yamlcpp ) diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index 29b7fe813..272dea3de 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -33,7 +33,7 @@ calamares_add_plugin( locale LINK_PRIVATE_LIBRARIES Qt5::Network ${geoip_libs} - yamlcpp + yamlcpp::yamlcpp SHARED_LIB ) diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt index ff6008d13..ac6630c6d 100644 --- a/src/modules/shellprocess/CMakeLists.txt +++ b/src/modules/shellprocess/CMakeLists.txt @@ -16,5 +16,5 @@ calamares_add_test( SOURCES Tests.cpp LIBRARIES - yamlcpp + yamlcpp::yamlcpp )