diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-06-12 19:31:44 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-06-14 16:32:59 +1000 |
| commit | 6eb982a83406cd16b03c44fe260b754a9e20da35 (patch) | |
| tree | 7dd60ad9ada09016e00ec11efb2095ce5cdf3fcf /cmake | |
| parent | 8c9c51f1d9797e9c89d7a23eebbdda07aa98392b (diff) | |
[xcode] fixes to allow xcode 10+ "new" build system to work
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/darwin_embedded/Macros.cmake | 7 | ||||
| -rw-r--r-- | cmake/scripts/osx/Macros.cmake | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cmake/scripts/darwin_embedded/Macros.cmake b/cmake/scripts/darwin_embedded/Macros.cmake index 91f2d868e7..a817d00c90 100644 --- a/cmake/scripts/darwin_embedded/Macros.cmake +++ b/cmake/scripts/darwin_embedded/Macros.cmake @@ -2,7 +2,9 @@ function(core_link_library lib wraplib) if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL Ninja) set(wrapper_obj cores/dll-loader/exports/CMakeFiles/wrapper.dir/wrapper.c.o) elseif(CMAKE_GENERATOR MATCHES "Xcode") - set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/wrapper.o) + # 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) else() message(FATAL_ERROR "Unsupported generator in core_link_library") endif() @@ -52,8 +54,7 @@ function(core_link_library lib wraplib) COMMAND ${CMAKE_C_COMPILER} ARGS ${CUSTOM_COMMAND_ARGS_LDFLAGS} ${export} -Wl,-force_load ${link_lib} ${extra_libs} -o ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension} - DEPENDS ${target} wrapper.def wrapper - VERBATIM) + DEPENDS ${target} wrapper.def wrapper) get_filename_component(libname ${wraplib} NAME_WE) add_custom_target(wrap_${libname} ALL DEPENDS ${wraplib}-${ARCH}${extension}) diff --git a/cmake/scripts/osx/Macros.cmake b/cmake/scripts/osx/Macros.cmake index 251cc79ff6..972824c005 100644 --- a/cmake/scripts/osx/Macros.cmake +++ b/cmake/scripts/osx/Macros.cmake @@ -2,7 +2,9 @@ function(core_link_library lib wraplib) if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL Ninja) set(wrapper_obj cores/dll-loader/exports/CMakeFiles/wrapper.dir/wrapper.c.o) elseif(CMAKE_GENERATOR MATCHES "Xcode") - set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/wrapper.o) + # 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) else() message(FATAL_ERROR "Unsupported generator in core_link_library") endif() @@ -52,8 +54,7 @@ function(core_link_library lib wraplib) COMMAND ${CMAKE_C_COMPILER} ARGS ${CUSTOM_COMMAND_ARGS_LDFLAGS} ${export} -Wl,-force_load ${link_lib} ${extra_libs} -o ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension} - DEPENDS ${target} wrapper.def wrapper - VERBATIM) + DEPENDS ${target} wrapper.def wrapper) get_filename_component(libname ${wraplib} NAME_WE) add_custom_target(wrap_${libname} ALL DEPENDS ${wraplib}-${ARCH}${extension}) |