From 4d98b83c170ac6fb90e3e23fa1480556d0505dfd Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 3 Dec 2011 23:00:12 +0100 Subject: Use plural form for CMake variables. Change-Id: Idc0cd360e09046a5746c9f7366c7fd4b982058fe Reviewed-by: Oswald Buddenhagen --- tests/manual/cmake/pass1/CMakeLists.txt | 2 +- tests/manual/cmake/pass2/CMakeLists.txt | 2 +- tests/manual/cmake/pass3/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/cmake/pass1/CMakeLists.txt b/tests/manual/cmake/pass1/CMakeLists.txt index 3ccca1ea31..c41a904d79 100644 --- a/tests/manual/cmake/pass1/CMakeLists.txt +++ b/tests/manual/cmake/pass1/CMakeLists.txt @@ -13,7 +13,7 @@ macro(qt5_use_package _target _package) # TODO: Handle public/private keywords? find_package(Qt5${_package} ${ARG1}) if (Qt5${_package}_FOUND) - target_link_libraries(${_target} ${Qt5${_package}_LIBRARY}) + target_link_libraries(${_target} ${Qt5${_package}_LIBRARIES}) include_directories(${Qt5${_package}_INCLUDE_DIRS}) # set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_package}_INCLUDE_DIRS}) set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_package}_COMPILE_DEFINITIONS}) diff --git a/tests/manual/cmake/pass2/CMakeLists.txt b/tests/manual/cmake/pass2/CMakeLists.txt index 31ddfa94a5..153b038c02 100644 --- a/tests/manual/cmake/pass2/CMakeLists.txt +++ b/tests/manual/cmake/pass2/CMakeLists.txt @@ -10,4 +10,4 @@ include_directories(${Qt5Core_INCLUDE_DIRS}) qt5_wrap_cpp(moc_files myobject.h) add_executable(myobject myobject.cpp ${moc_files}) -target_link_libraries(myobject ${Qt5Core_LIBRARY}) +target_link_libraries(myobject ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/pass3/CMakeLists.txt b/tests/manual/cmake/pass3/CMakeLists.txt index cbc448baa1..8c39b4f4a3 100644 --- a/tests/manual/cmake/pass3/CMakeLists.txt +++ b/tests/manual/cmake/pass3/CMakeLists.txt @@ -15,4 +15,4 @@ qt5_wrap_cpp(moc_files mywidget.h) qt5_wrap_ui(ui_files mywidget.ui) add_executable(mywidget mywidget.cpp ${moc_files} ${ui_files}) -target_link_libraries(mywidget ${Qt5Core_LIBRARY} ${Qt5Gui_LIBRARY} ${Qt5Widgets_LIBRARY}) +target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES}) -- cgit v1.2.3