summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2017-07-23 12:13:50 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2017-08-05 09:21:44 (GMT)
commit3a4840e0395133e0b28d5b1f424bf7365b5dd0e6 (patch)
tree43fdc149e8c69372089a99854754b3a1d4fd71a3
parent7c7a57ce9e14bf2eff1eb1de06e17a8216af1e18 (diff)
downloadCMake-3a4840e0395133e0b28d5b1f424bf7365b5dd0e6.zip
CMake-3a4840e0395133e0b28d5b1f424bf7365b5dd0e6.tar.gz
CMake-3a4840e0395133e0b28d5b1f424bf7365b5dd0e6.tar.bz2
Autogen: Make test per-config include directory compatible
-rw-r--r--Tests/QtAutogen/mocInclude/shared.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/Tests/QtAutogen/mocInclude/shared.cmake b/Tests/QtAutogen/mocInclude/shared.cmake
index c426050..d05f27c 100644
--- a/Tests/QtAutogen/mocInclude/shared.cmake
+++ b/Tests/QtAutogen/mocInclude/shared.cmake
@@ -29,9 +29,11 @@ set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/SObjB.cpp PROPERTY SKIP_AUTOMOC
qtx_generate_moc(
${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp
${CMAKE_CURRENT_BINARY_DIR}/SObjCExtra_extMoc.cpp)
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp PROPERTY SKIP_AUTOMOC ON)
+set_property(
+ SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp
+ PROPERTY SKIP_AUTOMOC ON)
# Custom target to depend on
-set(SOBJC_MOC ${CMAKE_CURRENT_BINARY_DIR}/${MOC_INCLUDE_NAME}_autogen/include/moc_SObjCExtra.cpp)
+set(SOBJC_MOC ${CMAKE_CURRENT_BINARY_DIR}/moc_SObjCExtra.cpp)
add_custom_target("${MOC_INCLUDE_NAME}_SOBJC"
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SObjCExtra_extMoc.cpp
BYPRODUCTS ${SOBJC_MOC}