mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 12:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

QtAutogen: Tests: Don't include CMAKE_CURRENT_BINARY_DIR

Browse Source
This commit is contained in:
Sebastian Holtermann
2016-12-02 12:34:37 +01:00
committed by Brad King
parent 43d77e1dad
commit 6731025211
5 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/QtAutogen/CMakeLists.txt
View File

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

1
Tests/QtAutogen/complex/Bdir/CMakeLists.txt
View File

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

3
Tests/QtAutogen/complex/CMakeLists.txt
View File

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

2
Tests/QtAutogen/defines_test/CMakeLists.txt
View File

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

3
Tests/QtAutogen/sameName/CMakeLists.txt
View File

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