mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'xcode-check-object-lib-subprojects-fixed'

Browse Source 
31d3e64080 Tests: Add Xcode cases fixed by switch to the "new build system"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5549
This commit is contained in:
Brad King
2020-12-01 14:30:41 +00:00
committed by Kitware Robot
parent cbe2c0119d 31d3e64080
commit f07b9d9e51
4 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+29
View File
@@ -51,6 +51,35 @@ run_cmake(PerConfigPerSourceOptions)
run_cmake(PerConfigPerSourceDefinitions)
run_cmake(PerConfigPerSourceIncludeDirs)
if(XCODE_VERSION VERSION_GREATER_EQUAL 12)
function(XcodeObjectLibsInTwoProjectsiOS)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeObjectLibsInTwoProjects-build-ios)
set(RunCMake_TEST_OPTIONS "-DCMAKE_SYSTEM_NAME=iOS")
run_cmake(XcodeObjectLibsInTwoProjects)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(XcodeObjectLibsInTwoProjects-build-ios ${CMAKE_COMMAND} --build . --target shared_lib -- -sdk iphonesimulator)
endfunction()
XcodeObjectLibsInTwoProjectsiOS()
function(XcodeObjectLibsInTwoProjectsMacOS)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeObjectLibsInTwoProjects-build-macos)
run_cmake(XcodeObjectLibsInTwoProjects)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(XcodeObjectLibsInTwoProjects-build-macos ${CMAKE_COMMAND} --build . --target shared_lib)
endfunction()
XcodeObjectLibsInTwoProjectsMacOS()
endif()
function(XcodeSchemaGeneration)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeSchemaGeneration-build)
set(RunCMake_TEST_NO_CLEAN 1)
Tests/RunCMake/XcodeProject/XcodeObjectLibsInTwoProjects.cmake
+5
View File
@@ -0,0 +1,5 @@
cmake_minimum_required (VERSION 3.19)
project (test_xcode_fail NONE)
add_subdirectory(subproject_two_object_libs)
Tests/RunCMake/XcodeProject/subproject_two_object_libs/CMakeLists.txt
+31
View File
@@ -0,0 +1,31 @@
cmake_minimum_required (VERSION 3.16)
enable_language(CXX)
project (subproject_two_object_libs)
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO)
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
if(IOS)
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
endif()
# Hierarchy of libraries looks like:
#
# OBJECT-1 ---> STATIC--\
# |---> SHARED
# OBJECT-2 -------------/
add_library(object_lib_dependency1 OBJECT dummy.cpp)
add_library(static_lib_dependency STATIC dummy.cpp $<TARGET_OBJECTS:object_lib_dependency1>)
add_library(object_lib_dependency2 OBJECT dummy.cpp)
target_link_libraries(object_lib_dependency2 PRIVATE static_lib_dependency)
add_library(shared_lib SHARED dummy.cpp)
target_link_libraries(shared_lib PRIVATE static_lib_dependency)
target_sources(shared_lib PRIVATE $<TARGET_OBJECTS:object_lib_dependency2>)
Tests/RunCMake/XcodeProject/subproject_two_object_libs/dummy.cpp
+5
View File
@@ -0,0 +1,5 @@
namespace {
void foo()
{
}
}