AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use plural form for CMake variables.

Browse Source 
Change-Id: Idc0cd360e09046a5746c9f7366c7fd4b982058fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Stephen Kelly 2011-12-03 23:00:12 +01:00 committed by Qt by Nokia
parent 3b3531285d
commit 4d98b83c17
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/cmake/Qt5BasicConfig.cmake.in
View File

@ -5,8 +5,7 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_MAJOR "$$eval(QT.$${MODULE}.MAJOR_VERSION)"
set(Qt5$${CMAKE_MODULE_NAME}_VERSION_MINOR "$$eval(QT.$${MODULE}.MINOR_VERSION)")
set(Qt5$${CMAKE_MODULE_NAME}_VERSION_PATCH "$$eval(QT.$${MODULE}.PATCH_VERSION)")
set(Qt5$${CMAKE_MODULE_NAME}_LIBRARY Qt5::$${CMAKE_MODULE_NAME})
set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${_qt5_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5_install_prefix}/$$CMAKE_INCLUDE_DIR/Qt$${CMAKE_MODULE_NAME}\")
string(TOUPPER "$${CMAKE_MODULE_NAME}" _CMAKE_MODULE_NAME_UPPER)

2
tests/manual/cmake/pass1/CMakeLists.txt
View File

@ -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})

2
tests/manual/cmake/pass2/CMakeLists.txt
View File

@ -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})

2
tests/manual/cmake/pass3/CMakeLists.txt
View File

@ -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})