diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-06-19 15:53:54 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-06-25 06:39:47 +1000 |
| commit | eddcab3d2c6324d8608734f096bc2da9d5766736 (patch) | |
| tree | 2fd1d1b2844351ed9ec9e0b9210a400f19dcbfc7 /cmake/scripts | |
| parent | 6b5b757db27034891861347f42b92f5dad29abd1 (diff) | |
[cmakebuildsys] disable xcode legacy buildsystem
Diffstat (limited to 'cmake/scripts')
| -rw-r--r-- | cmake/scripts/common/ModuleHelpers.cmake | 11 | ||||
| -rw-r--r-- | cmake/scripts/darwin_embedded/Macros.cmake | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake index 3898aa1ab7..7d1f17d7e1 100644 --- a/cmake/scripts/common/ModuleHelpers.cmake +++ b/cmake/scripts/common/ModuleHelpers.cmake @@ -171,6 +171,17 @@ endmacro() macro(BUILD_DEP_TARGET) include(ExternalProject) + # Remove cmake warning when Xcode generator used with "New" build system + if(CMAKE_GENERATOR STREQUAL Xcode) + # Policy CMP0114 is not set to NEW. In order to support the Xcode "new build + # system", this project must be updated to set policy CMP0114 to NEW. + if(CMAKE_XCODE_BUILD_SYSTEM STREQUAL 12) + cmake_policy(SET CMP0114 NEW) + else() + cmake_policy(SET CMP0114 OLD) + endif() + endif() + if(CMAKE_ARGS) set(CMAKE_ARGS CMAKE_ARGS ${CMAKE_ARGS} -DCMAKE_INSTALL_LIBDIR=lib diff --git a/cmake/scripts/darwin_embedded/Macros.cmake b/cmake/scripts/darwin_embedded/Macros.cmake index a817d00c90..100f938eca 100644 --- a/cmake/scripts/darwin_embedded/Macros.cmake +++ b/cmake/scripts/darwin_embedded/Macros.cmake @@ -4,7 +4,13 @@ function(core_link_library lib wraplib) elseif(CMAKE_GENERATOR MATCHES "Xcode") # CURRENT_VARIANT is an Xcode env var # CPU is a project cmake var - set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$(CURRENT_VARIANT)/${CPU}/wrapper.o) + # Xcode new build system (CMAKE_XCODE_BUILD_SYSTEM=12) requires the env var CURRENT_VARIANT to be passed WITHOUT brackets + # Xcode Legacy build system (CMAKE_XCODE_BUILD_SYSTEM=1) requires the env var CURRENT_VARIANT to be passed WITH brackets + if(CMAKE_XCODE_BUILD_SYSTEM STREQUAL 12) + set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$CURRENT_VARIANT/${CPU}/wrapper.o) + else() + set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$(CURRENT_VARIANT)/${CPU}/wrapper.o) + endif() else() message(FATAL_ERROR "Unsupported generator in core_link_library") endif() |