CMake: chase renamed YAMLCPP

This commit is contained in:
Adriaan de Groot 2021-07-26 15:08:29 +02:00
parent ce67712009
commit 4114a2bbe8
10 changed files with 11 additions and 11 deletions

View File

@ -123,5 +123,5 @@ if( BUILD_TESTING )
target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui ) target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui )
add_executable( test_conf test_conf.cpp ) 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() endif()

View File

@ -160,7 +160,7 @@ target_link_libraries( calamares
LINK_PRIVATE LINK_PRIVATE
${OPTIONAL_PRIVATE_LIBRARIES} ${OPTIONAL_PRIVATE_LIBRARIES}
LINK_PUBLIC LINK_PUBLIC
yamlcpp yamlcpp::yamlcpp
Qt5::Core Qt5::Core
KF5::CoreAddons KF5::CoreAddons
${OPTIONAL_PUBLIC_LIBRARIES} ${OPTIONAL_PUBLIC_LIBRARIES}
@ -315,7 +315,7 @@ calamares_add_test(
# This is not an actual test, it's a test / demo application # This is not an actual test, it's a test / demo application
# for experimenting with GeoIP. # for experimenting with GeoIP.
add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) 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 ) calamares_automoc( test_geoip )
if ( Qt5DBus_FOUND ) if ( Qt5DBus_FOUND )

View File

@ -76,7 +76,7 @@ calamares_add_library( calamaresui
EXPORT Calamares EXPORT Calamares
VERSION ${CALAMARES_VERSION_SHORT} 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 ) if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease ) target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease )
endif() endif()

View File

@ -17,5 +17,5 @@ calamares_add_test(
Tests.cpp Tests.cpp
ContextualProcessJob.cpp # Builds it a second time ContextualProcessJob.cpp # Builds it a second time
LIBRARIES LIBRARIES
yamlcpp yamlcpp::yamlcpp
) )

View File

@ -31,7 +31,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
Tests.cpp Tests.cpp
LIBRARIES LIBRARIES
calamares_job_fsresizer # From above calamares_job_fsresizer # From above
yamlcpp yamlcpp::yamlcpp
DEFINITIONS ${KPMcore_API_DEFINITIONS} DEFINITIONS ${KPMcore_API_DEFINITIONS}
) )
else() else()

View File

@ -42,5 +42,5 @@ calamares_add_test(
Tests.cpp Tests.cpp
HostInfoJob.cpp HostInfoJob.cpp
LIBRARIES LIBRARIES
yamlcpp yamlcpp::yamlcpp
) )

View File

@ -17,5 +17,5 @@ calamares_add_test(
Tests.cpp Tests.cpp
LIBRARIES LIBRARIES
calamares_job_initcpio # From above calamares_job_initcpio # From above
yamlcpp yamlcpp::yamlcpp
) )

View File

@ -17,5 +17,5 @@ calamares_add_test(
Tests.cpp Tests.cpp
LIBRARIES LIBRARIES
calamares_job_initramfs # From above calamares_job_initramfs # From above
yamlcpp yamlcpp::yamlcpp
) )

View File

@ -33,7 +33,7 @@ calamares_add_plugin( locale
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
Qt5::Network Qt5::Network
${geoip_libs} ${geoip_libs}
yamlcpp yamlcpp::yamlcpp
SHARED_LIB SHARED_LIB
) )

View File

@ -16,5 +16,5 @@ calamares_add_test(
SOURCES SOURCES
Tests.cpp Tests.cpp
LIBRARIES LIBRARIES
yamlcpp yamlcpp::yamlcpp
) )