mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Xcode: Refactor RunCMake.Framework test to prepare for static frameworks

Browse Source
This commit is contained in:
Gregor Jasny
2016-12-26 18:01:32 +01:00
committed by Brad King
parent 45405f00d2
commit d525754eab
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/CMakeLists.txt
+1 -2
View File
@@ -276,8 +276,7 @@ if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3)
add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION}) add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION})
endif() endif()
if(NOT XCODE if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0) AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
add_RunCMake_test(Framework) add_RunCMake_test(Framework)
endif() endif()
Tests/RunCMake/Framework/RunCMakeTest.cmake
+14 -28
View File
@@ -1,33 +1,19 @@
include(RunCMake) include(RunCMake)
# iOS function(framework_layout_test Name Toolchain)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}FrameworkLayout-build)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/iOSFrameworkLayout-build) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
set(RunCMake_TEST_NO_CLEAN 1) file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/ios.cmake")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") run_cmake(FrameworkLayout)
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake_command(${Name} ${CMAKE_COMMAND} --build .)
endfunction()
run_cmake(FrameworkLayout) # build check cannot cope with multi-configuration generators directory layout
run_cmake_command(iOSFrameworkLayout-build ${CMAKE_COMMAND} --build .) if(NOT RunCMake_GENERATOR STREQUAL "Xcode")
framework_layout_test(iOSFrameworkLayout-build ios)
unset(RunCMake_TEST_BINARY_DIR) framework_layout_test(OSXFrameworkLayout-build osx)
unset(RunCMake_TEST_NO_CLEAN) endif()
unset(RunCMake_TEST_OPTIONS)
# OSX
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/OSXFrameworkLayout-build)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
run_cmake(FrameworkLayout)
run_cmake_command(OSXFrameworkLayout-build ${CMAKE_COMMAND} --build .)
unset(RunCMake_TEST_BINARY_DIR)
unset(RunCMake_TEST_NO_CLEAN)
unset(RunCMake_TEST_OPTIONS)