diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2021-05-19 12:15:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 12:15:49 +1000 |
| commit | 26837490d80fb9c7549847855b5b64eb19bfa5db (patch) | |
| tree | f3c087f6462bfc9a4c4bc42bcba482c2911424fc /cmake | |
| parent | 8e87b0c9b5d0cb9d3b8770ee70ade580de2051c7 (diff) | |
| parent | 98e6d6752f7f422544da7133f669111fab9d1b3e (diff) | |
Merge pull request #18636 from fuzzard/osx_xcodebinarytarget
[Apple] Remove GL warning [osx] add binary addon target to xcode project
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/darwin_embedded/ArchSetup.cmake | 3 | ||||
| -rw-r--r-- | cmake/scripts/osx/ArchSetup.cmake | 3 | ||||
| -rw-r--r-- | cmake/scripts/osx/Install.cmake | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/cmake/scripts/darwin_embedded/ArchSetup.cmake b/cmake/scripts/darwin_embedded/ArchSetup.cmake index 7160da996e..6ea4562eed 100644 --- a/cmake/scripts/darwin_embedded/ArchSetup.cmake +++ b/cmake/scripts/darwin_embedded/ArchSetup.cmake @@ -12,7 +12,8 @@ else() list(APPEND ARCH_DEFINES -DTARGET_DARWIN_IOS) endif() set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - -D__STDC_CONSTANT_MACROS -DHAS_IOS_NETWORK -DHAS_ZEROCONF) + -D__STDC_CONSTANT_MACROS -DHAS_IOS_NETWORK -DHAS_ZEROCONF + -DGL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED) set(PLATFORM_DIR platform/darwin) set(PLATFORMDEFS_DIR platform/posix) set(CMAKE_SYSTEM_NAME Darwin) diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake index f723aa24c4..c656a4be25 100644 --- a/cmake/scripts/osx/ArchSetup.cmake +++ b/cmake/scripts/osx/ArchSetup.cmake @@ -8,7 +8,8 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX) set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - -D__STDC_CONSTANT_MACROS) + -D__STDC_CONSTANT_MACROS + -DGL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED) set(PLATFORM_DIR platform/darwin) set(PLATFORMDEFS_DIR platform/posix) set(CMAKE_SYSTEM_NAME Darwin) diff --git a/cmake/scripts/osx/Install.cmake b/cmake/scripts/osx/Install.cmake index 2ae41f5b17..65bac0705c 100644 --- a/cmake/scripts/osx/Install.cmake +++ b/cmake/scripts/osx/Install.cmake @@ -6,6 +6,21 @@ configure_file(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/Info.plist.in ${CMAKE_BINARY_DIR}/xbmc/platform/darwin/osx/Info.plist @ONLY) execute_process(COMMAND perl -p -i -e "s/r####/${APP_SCMID}/" ${CMAKE_BINARY_DIR}/xbmc/platform/darwin/osx/Info.plist) +# Create xcode target that allows to build binary-addons. +if(CMAKE_GENERATOR MATCHES "Xcode") + if(ADDONS_TO_BUILD) + set(_addons "ADDONS=${ADDONS_TO_BUILD}") + endif() + add_custom_target(binary-addons + COMMAND $(MAKE) -C ${CMAKE_SOURCE_DIR}/tools/depends/target/binary-addons clean + COMMAND $(MAKE) -C ${CMAKE_SOURCE_DIR}/tools/depends/target/binary-addons VERBOSE=1 V=99 + INSTALL_PREFIX="${CMAKE_BINARY_DIR}/addons" CROSS_COMPILING=yes ${_addons}) + if(ENABLE_XCODE_ADDONBUILD) + add_dependencies(${APP_NAME_LC} binary-addons) + endif() + unset(_addons) +endif() + add_custom_target(bundle COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}> ${PACKAGE_OUTPUT_DIR}/${APP_NAME} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/DllPaths_generated.h |