From f44ecaa4f27e7538ddcad66d40e543bffa2d2d86 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 4 Jun 2017 16:57:49 +0200 Subject: sync with upstream --- project/cmake/scripts/osx/ArchSetup.cmake | 34 -------- project/cmake/scripts/osx/ExtraTargets.cmake | 3 - project/cmake/scripts/osx/Install.cmake | 40 --------- project/cmake/scripts/osx/Macros.cmake | 118 --------------------------- project/cmake/scripts/osx/PathSetup.cmake | 32 -------- 5 files changed, 227 deletions(-) delete mode 100644 project/cmake/scripts/osx/ArchSetup.cmake delete mode 100644 project/cmake/scripts/osx/ExtraTargets.cmake delete mode 100644 project/cmake/scripts/osx/Install.cmake delete mode 100644 project/cmake/scripts/osx/Macros.cmake delete mode 100644 project/cmake/scripts/osx/PathSetup.cmake (limited to 'project/cmake/scripts/osx') diff --git a/project/cmake/scripts/osx/ArchSetup.cmake b/project/cmake/scripts/osx/ArchSetup.cmake deleted file mode 100644 index 3047863..0000000 --- a/project/cmake/scripts/osx/ArchSetup.cmake +++ /dev/null @@ -1,34 +0,0 @@ -if(NOT CMAKE_TOOLCHAIN_FILE) - message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for osx. See ${PROJECT_SOURCE_DIR}/README.md") -endif() - -set(CORE_MAIN_SOURCE ${CORE_SOURCE_DIR}/xbmc/platform/posix/main.cpp - ${CORE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.mm - ${CORE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.h) - -set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX) -set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_DEFINED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - -D__STDC_CONSTANT_MACROS) -set(PLATFORM_DIR linux) -set(CMAKE_SYSTEM_NAME Darwin) -if(WITH_ARCH) - set(ARCH ${WITH_ARCH}) -else() - if(CPU STREQUAL x86_64 OR CPU STREQUAL i386) - set(ARCH x86-osx) - set(NEON False) - else() - message(SEND_ERROR "Unknown CPU: ${CPU}") - endif() -endif() - -find_package(CXX11 REQUIRED) - -list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX}) - -list(APPEND DEPLIBS "-framework DiskArbitration" "-framework IOKit" - "-framework IOSurface" "-framework SystemConfiguration" - "-framework ApplicationServices" "-framework AppKit" - "-framework CoreAudio" "-framework AudioToolbox" - "-framework CoreGraphics" "-framework CoreMedia" - "-framework VideoToolbox") diff --git a/project/cmake/scripts/osx/ExtraTargets.cmake b/project/cmake/scripts/osx/ExtraTargets.cmake deleted file mode 100644 index ed9c089..0000000 --- a/project/cmake/scripts/osx/ExtraTargets.cmake +++ /dev/null @@ -1,3 +0,0 @@ -# XBMCHelper -add_subdirectory(${CORE_SOURCE_DIR}/tools/EventClients/Clients/OSXRemote build/XBMCHelper) -add_dependencies(${APP_NAME_LC} XBMCHelper) diff --git a/project/cmake/scripts/osx/Install.cmake b/project/cmake/scripts/osx/Install.cmake deleted file mode 100644 index 3924ccf..0000000 --- a/project/cmake/scripts/osx/Install.cmake +++ /dev/null @@ -1,40 +0,0 @@ -# OSX packaging - -set(PACKAGE_OUTPUT_DIR ${CMAKE_BINARY_DIR}/build/${CORE_BUILD_CONFIG}) - -configure_file(${CORE_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) - -add_custom_target(bundle - COMMAND ${CMAKE_COMMAND} -E copy $ ${PACKAGE_OUTPUT_DIR}/${APP_NAME} - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/DllPaths_generated.h - ${CMAKE_BINARY_DIR}/xbmc/DllPaths_generated.h - COMMAND "ACTION=build" - "TARGET_BUILD_DIR=${PACKAGE_OUTPUT_DIR}" - "TARGET_NAME=${APP_NAME}.app" - "APP_NAME=${APP_NAME}" - "SRCROOT=${CMAKE_BINARY_DIR}" - ${CORE_SOURCE_DIR}/tools/darwin/Support/CopyRootFiles-osx.command - COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}" - "TARGET_BUILD_DIR=${PACKAGE_OUTPUT_DIR}" - "TARGET_NAME=${APP_NAME}.app" - "APP_NAME=${APP_NAME}" - "FULL_PRODUCT_NAME=${APP_NAME}.app" - "SRCROOT=${CMAKE_BINARY_DIR}" - ${CORE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-osx.command) -set_target_properties(bundle PROPERTIES FOLDER "Build Utilities") -add_dependencies(bundle ${APP_NAME_LC}) - -configure_file(${CORE_SOURCE_DIR}/tools/darwin/packaging/osx/mkdmg-osx.sh.in - ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx/mkdmg-osx.sh @ONLY) - -add_custom_target(dmg - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CORE_SOURCE_DIR}/tools/darwin/packaging/osx/ - ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx/ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CORE_SOURCE_DIR}/tools/darwin/packaging/media/osx/ - ${CMAKE_BINARY_DIR}/tools/darwin/packaging/media/osx/ - COMMAND ./mkdmg-osx.sh ${CORE_BUILD_CONFIG} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx) -set_target_properties(dmg PROPERTIES FOLDER "Build Utilities") -add_dependencies(dmg bundle) diff --git a/project/cmake/scripts/osx/Macros.cmake b/project/cmake/scripts/osx/Macros.cmake deleted file mode 100644 index 52f87d1..0000000 --- a/project/cmake/scripts/osx/Macros.cmake +++ /dev/null @@ -1,118 +0,0 @@ -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) - else() - message(FATAL_ERROR "Unsupported generator in core_link_library") - endif() - - set(export -bundle -undefined dynamic_lookup -read_only_relocs suppress - -Wl,-alias_list,${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cores/dll-loader/exports/wrapper.def - ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${wrapper_obj}) - set(extension ${CMAKE_SHARED_MODULE_SUFFIX}) - set(check_arg "") - if(TARGET ${lib}) - set(target ${lib}) - set(link_lib $) - set(check_arg ${ARGV2}) - set(data_arg ${ARGV3}) - - # iOS: EFFECTIVE_PLATFORM_NAME is not resolved - # http://public.kitware.com/pipermail/cmake/2016-March/063049.html - if(CORE_SYSTEM_NAME STREQUAL ios AND CMAKE_GENERATOR STREQUAL Xcode) - get_target_property(dir ${lib} BINARY_DIR) - set(link_lib ${dir}/${CORE_BUILD_CONFIG}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}) - endif() - else() - set(target ${ARGV2}) - set(link_lib ${lib}) - set(check_arg ${ARGV3}) - set(data_arg ${ARGV4}) - endif() - if(check_arg STREQUAL export) - set(export ${export} - -Wl,--version-script=${ARGV3}) - elseif(check_arg STREQUAL extras) - foreach(arg ${data_arg}) - list(APPEND export ${arg}) - endforeach() - elseif(check_arg STREQUAL archives) - set(extra_libs ${data_arg}) - endif() - get_filename_component(dir ${wraplib} DIRECTORY) - - # We can't simply pass the linker flags to the args section of the custom command - # because cmake will add quotes around it (and the linker will fail due to those). - # We need to do this handstand first ... - string(REPLACE " " ";" CUSTOM_COMMAND_ARGS_LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS}) - - add_custom_command(OUTPUT ${wraplib}-${ARCH}${extension} - COMMAND ${CMAKE_COMMAND} -E make_directory ${dir} - 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) - - get_filename_component(libname ${wraplib} NAME_WE) - add_custom_target(wrap_${libname} ALL DEPENDS ${wraplib}-${ARCH}${extension}) - set_target_properties(wrap_${libname} PROPERTIES FOLDER lib/wrapped) - add_dependencies(${APP_NAME_LC}-libraries wrap_${libname}) - - set(LIBRARY_FILES ${LIBRARY_FILES} ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension} CACHE STRING "" FORCE) -endfunction() - -function(find_soname lib) - cmake_parse_arguments(arg "REQUIRED" "" "" ${ARGN}) - - string(TOLOWER ${lib} liblow) - if(${lib}_LDFLAGS) - set(link_lib "${${lib}_LDFLAGS}") - else() - set(link_lib "${${lib}_LIBRARIES}") - endif() - - execute_process(COMMAND ${CMAKE_C_COMPILER} -print-search-dirs - COMMAND fgrep libraries: - COMMAND sed "s/[^=]*=\\(.*\\)/\\1/" - COMMAND sed "s/:/ /g" - ERROR_QUIET - OUTPUT_VARIABLE cc_lib_path - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND echo ${link_lib} - COMMAND sed "s/-L[ ]*//g" - COMMAND sed "s/-l[^ ]*//g" - ERROR_QUIET - OUTPUT_VARIABLE env_lib_path - OUTPUT_STRIP_TRAILING_WHITESPACE) - - foreach(path ${cc_lib_path} ${env_lib_path}) - if(IS_DIRECTORY ${path}) - execute_process(COMMAND ls -- ${path}/lib${liblow}.dylib - ERROR_QUIET - OUTPUT_VARIABLE lib_file - OUTPUT_STRIP_TRAILING_WHITESPACE) - else() - set(lib_file ${path}) - endif() - if(lib_file) - # we want the path/name that is embedded in the dylib - execute_process(COMMAND otool -L ${lib_file} - COMMAND grep -v lib${liblow}.dylib - COMMAND grep ${liblow} - COMMAND awk "{V=1; print $V}" - ERROR_QUIET - OUTPUT_VARIABLE filename - OUTPUT_STRIP_TRAILING_WHITESPACE) - get_filename_component(${lib}_SONAME "${filename}" NAME) - if(VERBOSE) - message(STATUS "${lib} soname: ${${lib}_SONAME}") - endif() - endif() - endforeach() - if(arg_REQUIRED AND NOT ${lib}_SONAME) - message(FATAL_ERROR "Could not find dynamically loadable library ${lib}") - endif() - set(${lib}_SONAME ${${lib}_SONAME} PARENT_SCOPE) -endfunction() diff --git a/project/cmake/scripts/osx/PathSetup.cmake b/project/cmake/scripts/osx/PathSetup.cmake deleted file mode 100644 index 071dfd4..0000000 --- a/project/cmake/scripts/osx/PathSetup.cmake +++ /dev/null @@ -1,32 +0,0 @@ -if(NOT prefix) - set(prefix ${DEPENDS_PATH}) -endif() -if(NOT exec_prefix) - set(exec_prefix ${prefix}) -endif() -if(NOT libdir) - set(libdir ${prefix}/lib) -endif() -if(NOT bindir) - set(bindir ${prefix}/bin) -endif() -if(NOT includedir) - set(includedir ${prefix}/include) -endif() -if(NOT datarootdir) - set(datarootdir ${prefix}/share) -endif() -if(NOT datadir) - set(datadir ${datarootdir}) -endif() - -list(APPEND final_message "-- PATH config --") -list(APPEND final_message "Prefix: ${prefix}") -list(APPEND final_message "Libdir: ${libdir}") -list(APPEND final_message "Bindir: ${bindir}") -list(APPEND final_message "Includedir: ${includedir}") -list(APPEND final_message "Datarootdir: ${datarootdir}") -list(APPEND final_message "Datadir: ${datadir}") - -set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\" - -DINSTALL_PATH=\"${datarootdir}/kodi\") -- cgit v1.2.3