diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-02 11:34:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-07 13:24:05 (GMT) |
| commit | 6731025211bb300f762ac4d4984de124dc38c95a (patch) | |
| tree | 12d1140e1b4ce04ef1d9141a1683bcdcb833e077 | |
| parent | 43d77e1dadab06f9b49ebb6cbfdaffcc4b708f1a (diff) | |
| download | CMake-6731025211bb300f762ac4d4984de124dc38c95a.zip CMake-6731025211bb300f762ac4d4984de124dc38c95a.tar.gz CMake-6731025211bb300f762ac4d4984de124dc38c95a.tar.bz2 | |
QtAutogen: Tests: Don't include CMAKE_CURRENT_BINARY_DIR
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/complex/Bdir/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/complex/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/QtAutogen/defines_test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/sameName/CMakeLists.txt | 3 |
5 files changed, 3 insertions, 7 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index c4d0567..fdc766b 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -45,7 +45,6 @@ else() endif() get_property(QT_COMPILE_FEATURES TARGET ${QT_QTCORE_TARGET} PROPERTY INTERFACE_COMPILE_FEATURES) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) # -- Test: AUTORCC # RCC only diff --git a/Tests/QtAutogen/complex/Bdir/CMakeLists.txt b/Tests/QtAutogen/complex/Bdir/CMakeLists.txt index d9d4aa7..d338763 100644 --- a/Tests/QtAutogen/complex/Bdir/CMakeLists.txt +++ b/Tests/QtAutogen/complex/Bdir/CMakeLists.txt @@ -6,5 +6,4 @@ set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) add_library(libB SHARED libB.cpp) generate_export_header(libB) -# set_property(TARGET libB APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) target_link_libraries(libB LINK_PUBLIC libA) diff --git a/Tests/QtAutogen/complex/CMakeLists.txt b/Tests/QtAutogen/complex/CMakeLists.txt index 0d44f50..30d2708 100644 --- a/Tests/QtAutogen/complex/CMakeLists.txt +++ b/Tests/QtAutogen/complex/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.1) # -- Test: AUTOMOC AUTORCC AUTOUIC -include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DFOO -DSomeDefine="Barx") # enable relaxed mode so automoc can handle all the special cases: @@ -77,5 +76,7 @@ add_library(libC SHARED libC.cpp) set_target_properties(libC PROPERTIES AUTOMOC TRUE) generate_export_header(libC) target_link_libraries(libC LINK_PUBLIC libB) +target_include_directories(libC PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +set_property(TARGET libC APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR} ) target_link_libraries(QtAutogen codeeditorLib ${QT_LIBRARIES} libC) diff --git a/Tests/QtAutogen/defines_test/CMakeLists.txt b/Tests/QtAutogen/defines_test/CMakeLists.txt index ad4e684..9ee9a22 100644 --- a/Tests/QtAutogen/defines_test/CMakeLists.txt +++ b/Tests/QtAutogen/defines_test/CMakeLists.txt @@ -1,6 +1,4 @@ -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - add_executable(defines_test defines_test.cpp) set_target_properties(defines_test PROPERTIES AUTOMOC TRUE) target_link_libraries(defines_test Qt4::QtGui) diff --git a/Tests/QtAutogen/sameName/CMakeLists.txt b/Tests/QtAutogen/sameName/CMakeLists.txt index ed045fb..9e47a3e 100644 --- a/Tests/QtAutogen/sameName/CMakeLists.txt +++ b/Tests/QtAutogen/sameName/CMakeLists.txt @@ -16,6 +16,5 @@ add_executable(sameName data.qrc main.cpp ) -target_include_directories(sameName PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(sameName ${QT_LIBRARIES}) -set_target_properties( sameName PROPERTIES AUTOMOC TRUE AUTORCC TRUE ) +set_target_properties(sameName PROPERTIES AUTOMOC TRUE AUTORCC TRUE) |