diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-31 12:51:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-31 12:52:38 (GMT) |
| commit | 3251da6fa270f138920570aac89e8a5c65861661 (patch) | |
| tree | 26ba45ea2769f65175a18409fb104aa26b18e828 | |
| parent | b3379e63e04836d629bcecaa37f2f044ec11f523 (diff) | |
| parent | f34f7815e3e6d15dafb8df5264b588a23d293638 (diff) | |
| download | CMake-3251da6fa270f138920570aac89e8a5c65861661.zip CMake-3251da6fa270f138920570aac89e8a5c65861661.tar.gz CMake-3251da6fa270f138920570aac89e8a5c65861661.tar.bz2 | |
Merge topic 'fix-Qt5Autogen-xcode'
f34f7815 Tests: Fix Qt5Autogen test on Xcode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !908
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/QtAutogen/mocPlugin/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 101b396..073c5fd 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -304,10 +304,10 @@ if (NOT QT_TEST_VERSION STREQUAL 4) set(timeformat "%Y%j%H%M%S") set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin") set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin") - find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) file(TIMESTAMP "${plAFile}" plABefore "${timeformat}") file(TIMESTAMP "${plBFile}" plBBefore "${timeformat}") diff --git a/Tests/QtAutogen/mocPlugin/CMakeLists.txt b/Tests/QtAutogen/mocPlugin/CMakeLists.txt index 4843c21..f80aa29 100644 --- a/Tests/QtAutogen/mocPlugin/CMakeLists.txt +++ b/Tests/QtAutogen/mocPlugin/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.8) +project(mocPlugin CXX) set(CMAKE_AUTOMOC_DEPEND_FILTERS "A_CUSTOM_MACRO" |