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

Tests: Add Xcode cases fixed by switch to the "new build system"

Browse Source 
Support of 'new build system' in Xcode fixes indirectly few issues
which were caused by workaround with `XCODE_DEPEND_HELPER.cmake`
autogenerated script.

This patch adds test which is originated from issue #20260 and
reproduces this issue when 'new build system' is disabled.

Fixes: #20260
This commit is contained in:
Yauheni Khnykin
2020-11-29 17:54:56 +01:00
committed by Brad King
parent f85f86415b
commit 31d3e64080
4 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
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)

5
Tests/RunCMake/XcodeProject/XcodeObjectLibsInTwoProjects.cmake Normal file
View File

@@ -0,0 +1,5 @@
cmake_minimum_required (VERSION 3.19)
project (test_xcode_fail NONE)
add_subdirectory(subproject_two_object_libs)

31
Tests/RunCMake/XcodeProject/subproject_two_object_libs/CMakeLists.txt Normal file
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>)

5
Tests/RunCMake/XcodeProject/subproject_two_object_libs/dummy.cpp Normal file
View File

@@ -0,0 +1,5 @@
namespace {
void foo()
{
}
}