reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-22 03:16:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-Qt5Autogen-xcode'

Browse Source 
f34f7815 Tests: Fix Qt5Autogen test on Xcode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !908
This commit is contained in:
Brad King 2017-05-31 12:51:55 +00:00 committed by Kitware Robot
commit 3251da6fa2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/QtAutogen/CMakeLists.txt
View File

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

1
Tests/QtAutogen/mocPlugin/CMakeLists.txt
View File

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(mocPlugin CXX)
set(CMAKE_AUTOMOC_DEPEND_FILTERS
"A_CUSTOM_MACRO"