summaryrefslogtreecommitdiffstats
path: root/cmake/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/scripts')
-rw-r--r--cmake/scripts/android/ArchSetup.cmake16
-rw-r--r--cmake/scripts/android/Install.cmake26
-rw-r--r--cmake/scripts/common/AddonHelpers.cmake19
-rw-r--r--cmake/scripts/common/ArchSetup.cmake3
-rw-r--r--cmake/scripts/common/GenerateVersionedFiles.cmake10
-rw-r--r--cmake/scripts/common/HandleDepends.cmake13
-rw-r--r--cmake/scripts/common/Macros.cmake54
-rw-r--r--cmake/scripts/common/Platform.cmake9
-rw-r--r--cmake/scripts/common/PrepareEnv.cmake14
-rw-r--r--cmake/scripts/freebsd/ArchSetup.cmake5
-rw-r--r--cmake/scripts/freebsd/ExtraTargets.cmake29
-rw-r--r--cmake/scripts/ios/ArchSetup.cmake5
-rw-r--r--cmake/scripts/ios/Install.cmake2
-rw-r--r--cmake/scripts/linux/ArchSetup.cmake37
-rw-r--r--cmake/scripts/linux/Install.cmake13
-rwxr-xr-xcmake/scripts/linux/clang-check-test.sh.in2
-rw-r--r--cmake/scripts/osx/ArchSetup.cmake5
-rw-r--r--cmake/scripts/windows/ArchSetup.cmake25
-rw-r--r--cmake/scripts/windowsstore/ArchSetup.cmake121
-rw-r--r--cmake/scripts/windowsstore/CFlagOverrides.cmake12
-rw-r--r--cmake/scripts/windowsstore/CXXFlagOverrides.cmake12
-rw-r--r--cmake/scripts/windowsstore/Install.cmake0
-rw-r--r--cmake/scripts/windowsstore/Macros.cmake181
-rw-r--r--cmake/scripts/windowsstore/PathSetup.cmake34
-rw-r--r--cmake/scripts/windowsstore/tools/patch.cmake37
25 files changed, 622 insertions, 62 deletions
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake
index 7b8b466..03056fa 100644
--- a/cmake/scripts/android/ArchSetup.cmake
+++ b/cmake/scripts/android/ArchSetup.cmake
@@ -6,15 +6,22 @@ endif()
6 6
7set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID) 7set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID)
8set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE 8set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE
9 -D_FILE_OFFSET_BITS=64) 9 -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64=1)
10set(PLATFORM_DIR linux) 10
11# Main cpp
12set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/android/activity/XBMCApp.cpp)
13
14set(PLATFORM_DIR platform/linux)
11if(WITH_ARCH) 15if(WITH_ARCH)
12 set(ARCH ${WITH_ARCH}) 16 set(ARCH ${WITH_ARCH})
13else() 17else()
14 if(CPU STREQUAL armeabi-v7a) 18 if(CPU STREQUAL armeabi-v7a)
15 set(ARCH arm) 19 set(ARCH arm)
16 set(NEON True) 20 set(NEON True)
17 set(NEON_FLAGS "-mfpu=neon -mvectorize-with-neon-quad") 21 set(NEON_FLAGS "-mfpu=neon")
22 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
23 set(NEON_FLAGS "${NEON_FLAGS} -mvectorize-with-neon-quad")
24 endif()
18 elseif(CPU STREQUAL arm64-v8a) 25 elseif(CPU STREQUAL arm64-v8a)
19 set(ARCH aarch64) 26 set(ARCH aarch64)
20 set(NEON True) 27 set(NEON True)
@@ -26,6 +33,9 @@ else()
26 endif() 33 endif()
27endif() 34endif()
28 35
36# Additional SYSTEM_DEFINES
37list(APPEND SYSTEM_DEFINES -DHAS_ZEROCONF)
38
29set(ENABLE_X11 OFF CACHE BOOL "" FORCE) 39set(ENABLE_X11 OFF CACHE BOOL "" FORCE)
30set(ENABLE_AML OFF CACHE BOOL "" FORCE) 40set(ENABLE_AML OFF CACHE BOOL "" FORCE)
31set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE) 41set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
index 46181f7..cc52d51 100644
--- a/cmake/scripts/android/Install.cmake
+++ b/cmake/scripts/android/Install.cmake
@@ -26,14 +26,38 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/apksign
26 ${CMAKE_BINARY_DIR}/tools/android/packaging/apksign COPYONLY) 26 ${CMAKE_BINARY_DIR}/tools/android/packaging/apksign COPYONLY)
27configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/make_symbols.sh 27configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/make_symbols.sh
28 ${CMAKE_BINARY_DIR}/tools/android/packaging/make_symbols.sh COPYONLY) 28 ${CMAKE_BINARY_DIR}/tools/android/packaging/make_symbols.sh COPYONLY)
29configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/build.gradle
30 ${CMAKE_BINARY_DIR}/tools/android/packaging/build.gradle COPYONLY)
31configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/gradlew
32 ${CMAKE_BINARY_DIR}/tools/android/packaging/gradlew COPYONLY)
33configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/settings.gradle
34 ${CMAKE_BINARY_DIR}/tools/android/packaging/settings.gradle COPYONLY)
35configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.jar
36 ${CMAKE_BINARY_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.jar COPYONLY)
37configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties
38 ${CMAKE_BINARY_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties COPYONLY)
29file(WRITE ${CMAKE_BINARY_DIR}/tools/depends/Makefile.include 39file(WRITE ${CMAKE_BINARY_DIR}/tools/depends/Makefile.include
30 "$(PREFIX)/lib/${APP_NAME_LC}/lib${APP_NAME_LC}.so: ;\n") 40 "$(PREFIX)/lib/${APP_NAME_LC}/lib${APP_NAME_LC}.so: ;\n")
31 41
42string(REPLACE "." ";" APP_VERSION_CODE_LIST ${APP_VERSION_CODE})
43list(GET APP_VERSION_CODE_LIST 0 major)
44list(GET APP_VERSION_CODE_LIST 1 minor)
45list(GET APP_VERSION_CODE_LIST 2 patch)
46unset(APP_VERSION_CODE_LIST)
47math(EXPR APP_VERSION_CODE_ANDROID "(${major} * 100 + ${minor}) * 1000 + ${patch}")
48unset(major)
49unset(minor)
50if(ARCH STREQUAL aarch64 AND patch LESS 999)
51 math(EXPR APP_VERSION_CODE_ANDROID "${APP_VERSION_CODE_ANDROID} + 1")
52endif()
53unset(patch)
54
32set(package_files strings.xml 55set(package_files strings.xml
33 activity_main.xml 56 activity_main.xml
34 colors.xml 57 colors.xml
35 searchable.xml 58 searchable.xml
36 AndroidManifest.xml 59 AndroidManifest.xml
60 build.gradle
37 src/Main.java 61 src/Main.java
38 src/Splash.java 62 src/Splash.java
39 src/XBMCBroadcastReceiver.java 63 src/XBMCBroadcastReceiver.java
@@ -124,6 +148,8 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean
124 CC=${CMAKE_C_COMPILER} 148 CC=${CMAKE_C_COMPILER}
125 CPU=${CPU} 149 CPU=${CPU}
126 ARCH=${ARCH} 150 ARCH=${ARCH}
151 HOST=${HOST}
152 TOOLCHAIN=${TOOLCHAIN}
127 PREFIX=${prefix} 153 PREFIX=${prefix}
128 DEPENDS_PATH=${DEPENDS_PATH} 154 DEPENDS_PATH=${DEPENDS_PATH}
129 NDKROOT=${NDKROOT} 155 NDKROOT=${NDKROOT}
diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake
index 2fafe79..c11923e 100644
--- a/cmake/scripts/common/AddonHelpers.cmake
+++ b/cmake/scripts/common/AddonHelpers.cmake
@@ -52,7 +52,8 @@ macro (build_addon target prefix libs)
52 # Read used headers from addon, needed to identitfy used kodi addon interface headers 52 # Read used headers from addon, needed to identitfy used kodi addon interface headers
53 if(${prefix}_HEADERS) 53 if(${prefix}_HEADERS)
54 # Add the used header files defined with CMakeLists.txt from addon itself 54 # Add the used header files defined with CMakeLists.txt from addon itself
55 if(${prefix}_HEADERS MATCHES ${PROJECT_SOURCE_DIR}) 55 string(FIND "${${prefix}_HEADERS}" "${PROJECT_SOURCE_DIR}" position)
56 if(position GREATER -1)
56 # include path name already complete 57 # include path name already complete
57 list(APPEND USED_SOURCES ${${prefix}_HEADERS}) 58 list(APPEND USED_SOURCES ${${prefix}_HEADERS})
58 else() 59 else()
@@ -75,7 +76,8 @@ macro (build_addon target prefix libs)
75 endif() 76 endif()
76 77
77 # Add the used source files defined with CMakeLists.txt from addon itself 78 # Add the used source files defined with CMakeLists.txt from addon itself
78 if(${prefix}_SOURCES MATCHES ${PROJECT_SOURCE_DIR}) 79 string(FIND "${${prefix}_SOURCES}" "${PROJECT_SOURCE_DIR}" position)
80 if(position GREATER -1)
79 # include path name already complete 81 # include path name already complete
80 list(APPEND USED_SOURCES ${${prefix}_SOURCES}) 82 list(APPEND USED_SOURCES ${${prefix}_SOURCES})
81 else() 83 else()
@@ -228,7 +230,9 @@ macro (build_addon target prefix libs)
228 set(CPACK_COMPONENTS_IGNORE_GROUPS 1) 230 set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
229 list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION}) 231 list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
230 # Pack files together to create an archive 232 # Pack files together to create an archive
231 install(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION} PATTERN "*.xml.in" EXCLUDE) 233 install(DIRECTORY ${target} DESTINATION ./
234 COMPONENT ${target}-${${prefix}_VERSION}
235 REGEX ".+\\.xml\\.in(clude)?$" EXCLUDE)
232 if(WIN32) 236 if(WIN32)
233 if(NOT CPACK_PACKAGE_DIRECTORY) 237 if(NOT CPACK_PACKAGE_DIRECTORY)
234 # determine the temporary path 238 # determine the temporary path
@@ -321,7 +325,8 @@ macro (build_addon target prefix libs)
321 if (${prefix}_CUSTOM_BINARY) 325 if (${prefix}_CUSTOM_BINARY)
322 install(FILES ${LIBRARY_LOCATION} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target} RENAME ${LIBRARY_FILENAME}) 326 install(FILES ${LIBRARY_LOCATION} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target} RENAME ${LIBRARY_FILENAME})
323 endif() 327 endif()
324 install(DIRECTORY ${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons PATTERN "*.xml.in" EXCLUDE) 328 install(DIRECTORY ${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons
329 REGEX ".+\\.xml\\.in(clude)?$" EXCLUDE)
325 if(${prefix}_CUSTOM_DATA) 330 if(${prefix}_CUSTOM_DATA)
326 install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons/${target}/resources) 331 install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons/${target}/resources)
327 endif() 332 endif()
@@ -348,6 +353,12 @@ macro (build_addon target prefix libs)
348 COMMAND ${CMAKE_COMMAND} -E copy 353 COMMAND ${CMAKE_COMMAND} -E copy
349 ${LIBRARY_LOCATION} 354 ${LIBRARY_LOCATION}
350 ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/${LIBRARY_FILENAME}) 355 ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/${LIBRARY_FILENAME})
356 if(${prefix}_ADDITIONAL_BINARY)
357 add_custom_command(TARGET ${target} POST_BUILD
358 COMMAND ${CMAKE_COMMAND} -E copy
359 ${${prefix}_ADDITIONAL_BINARY}
360 ${${APP_NAME_UC}_BUILD_DIR}/addons/${target})
361 endif()
351 endif() 362 endif()
352endmacro() 363endmacro()
353 364
diff --git a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake
index 357c14c..3b81533 100644
--- a/cmake/scripts/common/ArchSetup.cmake
+++ b/cmake/scripts/common/ArchSetup.cmake
@@ -11,6 +11,9 @@
11# DEP_DEFINES - compiler definitions for system dependencies (e.g. LIRC) 11# DEP_DEFINES - compiler definitions for system dependencies (e.g. LIRC)
12# + the results of compiler tests etc. 12# + the results of compiler tests etc.
13 13
14# workaround a bug in older cmake, where binutils wouldn't be set after deleting CMakeCache.txt
15include(CMakeFindBinUtils)
16
14include(CheckCXXSourceCompiles) 17include(CheckCXXSourceCompiles)
15include(CheckSymbolExists) 18include(CheckSymbolExists)
16include(CheckFunctionExists) 19include(CheckFunctionExists)
diff --git a/cmake/scripts/common/GenerateVersionedFiles.cmake b/cmake/scripts/common/GenerateVersionedFiles.cmake
index 90b2173..011f495 100644
--- a/cmake/scripts/common/GenerateVersionedFiles.cmake
+++ b/cmake/scripts/common/GenerateVersionedFiles.cmake
@@ -13,12 +13,11 @@ endfunction()
13 13
14# add-on xml's 14# add-on xml's
15file(GLOB ADDON_XML_IN_FILE ${CORE_SOURCE_DIR}/addons/*/addon.xml.in) 15file(GLOB ADDON_XML_IN_FILE ${CORE_SOURCE_DIR}/addons/*/addon.xml.in)
16foreach(loop_var ${ADDON_XML_IN_FILE})
17 # prevent 'xbmc.json'; will be obtained from 'xbmc/interfaces/json-rpc/schema/CMakeLists.txt'.
18 if(loop_var MATCHES "xbmc.json")
19 continue()
20 endif()
21 16
17# remove 'xbmc.json', will be created from 'xbmc/interfaces/json-rpc/schema/CMakeLists.txt'
18list(REMOVE_ITEM ADDON_XML_IN_FILE xbmc.json)
19
20foreach(loop_var ${ADDON_XML_IN_FILE})
22 list(GET loop_var 0 xml_name) 21 list(GET loop_var 0 xml_name)
23 22
24 string(REPLACE "/addon.xml.in" "" source_dir ${xml_name}) 23 string(REPLACE "/addon.xml.in" "" source_dir ${xml_name})
@@ -35,4 +34,5 @@ foreach(loop_var ${ADDON_XML_IN_FILE})
35 unset(xml_name) 34 unset(xml_name)
36endforeach() 35endforeach()
37 36
37
38generate_versioned_file(xbmc/CompileInfo.cpp.in ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp) 38generate_versioned_file(xbmc/CompileInfo.cpp.in ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp)
diff --git a/cmake/scripts/common/HandleDepends.cmake b/cmake/scripts/common/HandleDepends.cmake
index 85d2cf4..49e5ac8 100644
--- a/cmake/scripts/common/HandleDepends.cmake
+++ b/cmake/scripts/common/HandleDepends.cmake
@@ -7,6 +7,10 @@ function(add_addon_depends addon searchpath)
7 set(OUTPUT_DIR ${ADDON_DEPENDS_PATH}) 7 set(OUTPUT_DIR ${ADDON_DEPENDS_PATH})
8 # look for platform-specific dependencies 8 # look for platform-specific dependencies
9 file(GLOB_RECURSE cmake_input_files ${searchpath}/${CORE_SYSTEM_NAME}/*.txt) 9 file(GLOB_RECURSE cmake_input_files ${searchpath}/${CORE_SYSTEM_NAME}/*.txt)
10 # backward compatibility
11 if(NOT cmake_input_files AND CORE_SYSTEM_NAME STREQUAL windowsstore)
12 file(GLOB_RECURSE cmake_input_files ${searchpath}/windows/*.txt)
13 endif()
10 file(GLOB_RECURSE cmake_input_files2 ${searchpath}/common/*.txt) 14 file(GLOB_RECURSE cmake_input_files2 ${searchpath}/common/*.txt)
11 list(APPEND cmake_input_files ${cmake_input_files2}) 15 list(APPEND cmake_input_files ${cmake_input_files2})
12 16
@@ -67,6 +71,11 @@ function(add_addon_depends addon searchpath)
67 -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME} 71 -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME}
68 -DENABLE_STATIC=1 72 -DENABLE_STATIC=1
69 -DBUILD_SHARED_LIBS=0) 73 -DBUILD_SHARED_LIBS=0)
74 # windows store args
75 if (CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
76 list(APPEND BUILD_ARGS -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
77 -DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION})
78 endif()
70 # if there are no make rules override files available take care of manually passing on ARCH_DEFINES 79 # if there are no make rules override files available take care of manually passing on ARCH_DEFINES
71 if(NOT CMAKE_USER_MAKE_RULES_OVERRIDE AND NOT CMAKE_USER_MAKE_RULES_OVERRIDE_CXX) 80 if(NOT CMAKE_USER_MAKE_RULES_OVERRIDE AND NOT CMAKE_USER_MAKE_RULES_OVERRIDE_CXX)
72 # make sure we create strings, not lists 81 # make sure we create strings, not lists
@@ -147,6 +156,10 @@ function(add_addon_depends addon searchpath)
147 if(EXISTS ${dir}/${CORE_SYSTEM_NAME}-deps.txt) 156 if(EXISTS ${dir}/${CORE_SYSTEM_NAME}-deps.txt)
148 file(STRINGS ${dir}/${CORE_SYSTEM_NAME}-deps.txt deps) 157 file(STRINGS ${dir}/${CORE_SYSTEM_NAME}-deps.txt deps)
149 message(STATUS "${id} depends: ${deps}") 158 message(STATUS "${id} depends: ${deps}")
159 # backward compatibility
160 elseif(CORE_SYSTEM_NAME STREQUAL windowsstore AND EXISTS ${dir}/windows-deps.txt)
161 file(STRINGS ${dir}/windows-deps.txt deps)
162 message(STATUS "${id} depends: ${deps}")
150 elseif(EXISTS ${dir}/deps.txt) 163 elseif(EXISTS ${dir}/deps.txt)
151 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/deps.txt) 164 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/deps.txt)
152 file(STRINGS ${dir}/deps.txt deps) 165 file(STRINGS ${dir}/deps.txt deps)
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index 9f00bb7..d508f87 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -72,11 +72,15 @@ function(core_add_library name)
72 add_library(${name} STATIC ${SOURCES} ${HEADERS} ${OTHERS}) 72 add_library(${name} STATIC ${SOURCES} ${HEADERS} ${OTHERS})
73 set_target_properties(${name} PROPERTIES PREFIX "") 73 set_target_properties(${name} PROPERTIES PREFIX "")
74 set(core_DEPENDS ${name} ${core_DEPENDS} CACHE STRING "" FORCE) 74 set(core_DEPENDS ${name} ${core_DEPENDS} CACHE STRING "" FORCE)
75 add_dependencies(${name} libcpluff ffmpeg dvdnav crossguid ${PLATFORM_GLOBAL_TARGET_DEPS}) 75 set(lib_DEPS libcpluff ffmpeg crossguid ${PLATFORM_GLOBAL_TARGET_DEPS})
76 if(NOT CORE_SYSTEM_NAME STREQUAL windowsstore)
77 list(APPEND lib_DEPS dvdnav)
78 endif()
79 add_dependencies(${name} ${lib_DEPS})
76 set(CORE_LIBRARY ${name} PARENT_SCOPE) 80 set(CORE_LIBRARY ${name} PARENT_SCOPE)
77 81
78 # Add precompiled headers to Kodi main libraries 82 # Add precompiled headers to Kodi main libraries
79 if(CORE_SYSTEM_NAME STREQUAL windows) 83 if(CORE_SYSTEM_NAME MATCHES windows)
80 add_precompiled_header(${name} pch.h ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/pch.cpp PCH_TARGET kodi) 84 add_precompiled_header(${name} pch.h ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/pch.cpp PCH_TARGET kodi)
81 set_language_cxx(${name}) 85 set_language_cxx(${name})
82 target_link_libraries(${name} PUBLIC effects11) 86 target_link_libraries(${name} PUBLIC effects11)
@@ -102,7 +106,11 @@ function(core_add_test_library name)
102 set_target_properties(${name} PROPERTIES PREFIX "" 106 set_target_properties(${name} PROPERTIES PREFIX ""
103 EXCLUDE_FROM_ALL 1 107 EXCLUDE_FROM_ALL 1
104 FOLDER "Build Utilities/tests") 108 FOLDER "Build Utilities/tests")
105 add_dependencies(${name} libcpluff ffmpeg dvdnav crossguid) 109 set(lib_DEPS libcpluff ffmpeg crossguid ${PLATFORM_GLOBAL_TARGET_DEPS})
110 if(NOT CORE_SYSTEM_NAME STREQUAL windowsstore)
111 list(APPEND lib_DEPS dvdnav)
112 endif()
113 add_dependencies(${name} ${lib_DEPS})
106 set(test_archives ${test_archives} ${name} CACHE STRING "" FORCE) 114 set(test_archives ${test_archives} ${name} CACHE STRING "" FORCE)
107 endif() 115 endif()
108 foreach(src IN LISTS SOURCES SUPPORTED_SOURCES HEADERS OTHERS) 116 foreach(src IN LISTS SOURCES SUPPORTED_SOURCES HEADERS OTHERS)
@@ -314,6 +322,7 @@ function(copy_files_from_filelist_to_buildtree pattern)
314 copy_file_to_buildtree(${CMAKE_SOURCE_DIR}/${file} DIRECTORY ${dest} ${DIR_OPTION}) 322 copy_file_to_buildtree(${CMAKE_SOURCE_DIR}/${file} DIRECTORY ${dest} ${DIR_OPTION})
315 endif() 323 endif()
316 endforeach() 324 endforeach()
325 set(DIR_OPTION)
317 endforeach() 326 endforeach()
318 endforeach() 327 endforeach()
319 endforeach() 328 endforeach()
@@ -583,7 +592,8 @@ function(core_find_git_rev stamp)
583 else() 592 else()
584 find_package(Git) 593 find_package(Git)
585 if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) 594 if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
586 execute_process(COMMAND ${GIT_EXECUTABLE} update-index --ignore-submodules --refresh -q) 595 execute_process(COMMAND ${GIT_EXECUTABLE} update-index --ignore-submodules -q --refresh
596 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
587 execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet -- 597 execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet --
588 RESULT_VARIABLE status_code 598 RESULT_VARIABLE status_code
589 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) 599 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
@@ -610,7 +620,11 @@ function(core_find_git_rev stamp)
610 string(REPLACE "-" "" DATE ${DATE}) 620 string(REPLACE "-" "" DATE ${DATE})
611 else() 621 else()
612 string(TIMESTAMP DATE "%Y%m%d" UTC) 622 string(TIMESTAMP DATE "%Y%m%d" UTC)
613 set(HASH "nogitfound") 623 if(EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
624 file(STRINGS ${CMAKE_SOURCE_DIR}/VERSION HASH LIMIT_INPUT 16)
625 else()
626 set(HASH "nogitfound")
627 endif()
614 endif() 628 endif()
615 cmake_parse_arguments(arg "FULL" "" "" ${ARGN}) 629 cmake_parse_arguments(arg "FULL" "" "" ${ARGN})
616 if(arg_FULL) 630 if(arg_FULL)
@@ -637,6 +651,7 @@ endfunction()
637# APP_VERSION - the app version (${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}-${APP_VERSION_TAG}) 651# APP_VERSION - the app version (${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}-${APP_VERSION_TAG})
638# APP_ADDON_API - the addon API version in the form of 16.9.702 652# APP_ADDON_API - the addon API version in the form of 16.9.702
639# FILE_VERSION - file version in the form of 16,9,702,0 - Windows only 653# FILE_VERSION - file version in the form of 16,9,702,0 - Windows only
654# JSONRPC_VERSION - the json api version in the form of 8.3.0
640# 655#
641# Set various variables defined in "versions.h" 656# Set various variables defined in "versions.h"
642macro(core_find_versions) 657macro(core_find_versions)
@@ -651,9 +666,28 @@ macro(core_find_versions)
651 666
652 include(CMakeParseArguments) 667 include(CMakeParseArguments)
653 core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt) 668 core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt)
654 string(REPLACE " " ";" version_list "${version_list}") 669 core_file_read_filtered(json_version ${CORE_SOURCE_DIR}/xbmc/interfaces/json-rpc/schema/version.txt)
655 cmake_parse_arguments(APP "" "APP_NAME;COMPANY_NAME;WEBSITE;VERSION_MAJOR;VERSION_MINOR;VERSION_TAG;VERSION_CODE;ADDON_API;APP_PACKAGE" "" ${version_list}) 670 string(REGEX REPLACE "([^ ;]*) ([^;]*)" "\\1;\\2" version_list "${version_list};${json_version}")
656 671 set(version_props
672 ADDON_API
673 APP_NAME
674 APP_PACKAGE
675 COMPANY_NAME
676 JSONRPC_VERSION
677 PACKAGE_DESCRIPTION
678 PACKAGE_IDENTITY
679 PACKAGE_PUBLISHER
680 VERSION_MAJOR
681 VERSION_MINOR
682 VERSION_TAG
683 VERSION_CODE
684 WEBSITE
685 )
686 cmake_parse_arguments(APP "" "${version_props}" "" ${version_list})
687
688 if(NOT ${APP_VERSION_CODE} MATCHES "^[0-9]+\\.[0-9][0-9]?\\.[0-9][0-9]?[0-9]?$")
689 message(FATAL_ERROR "VERSION_CODE was set to ${APP_VERSION_CODE} in version.txt, but it has to match '^\\d+\\.\\d{1,2}\\.\\d{1,3}$'")
690 endif()
657 set(APP_NAME ${APP_APP_NAME}) # inconsistency but APP_APP_NAME looks weird 691 set(APP_NAME ${APP_APP_NAME}) # inconsistency but APP_APP_NAME looks weird
658 string(TOLOWER ${APP_APP_NAME} APP_NAME_LC) 692 string(TOLOWER ${APP_APP_NAME} APP_NAME_LC)
659 string(TOUPPER ${APP_APP_NAME} APP_NAME_UC) 693 string(TOUPPER ${APP_APP_NAME} APP_NAME_UC)
@@ -665,6 +699,7 @@ macro(core_find_versions)
665 string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC) 699 string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC)
666 endif() 700 endif()
667 string(REPLACE "." "," FILE_VERSION ${APP_ADDON_API}.0) 701 string(REPLACE "." "," FILE_VERSION ${APP_ADDON_API}.0)
702 set(JSONRPC_VERSION ${APP_JSONRPC_VERSION})
668 703
669 # Set defines used in addon.xml.in and read from versions.h to set add-on 704 # Set defines used in addon.xml.in and read from versions.h to set add-on
670 # version parts automatically 705 # version parts automatically
@@ -689,6 +724,9 @@ macro(core_find_versions)
689 if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR) 724 if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
690 message(FATAL_ERROR "Could not determine app version! Make sure that ${CORE_SOURCE_DIR}/version.txt exists") 725 message(FATAL_ERROR "Could not determine app version! Make sure that ${CORE_SOURCE_DIR}/version.txt exists")
691 endif() 726 endif()
727 if(NOT DEFINED JSONRPC_VERSION)
728 message(FATAL_ERROR "Could not determine json-rpc version! Make sure that ${CORE_SOURCE_DIR}/xbmc/interfaces/json-rpc/schema/version.txt exists")
729 endif()
692endmacro() 730endmacro()
693 731
694# add-on xml's 732# add-on xml's
diff --git a/cmake/scripts/common/Platform.cmake b/cmake/scripts/common/Platform.cmake
index b19b7e5..5ac233a 100644
--- a/cmake/scripts/common/Platform.cmake
+++ b/cmake/scripts/common/Platform.cmake
@@ -2,14 +2,17 @@ if(NOT CORE_SYSTEM_NAME)
2 string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME) 2 string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME)
3endif() 3endif()
4 4
5if(CORE_SYSTEM_NAME STREQUAL linux) 5if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
6 # Set default CORE_PLATFORM_NAME to X11 6 # Set default CORE_PLATFORM_NAME to X11
7 # This is overridden by user setting -DCORE_PLATFORM_NAME=<platform> 7 # This is overridden by user setting -DCORE_PLATFORM_NAME=<platform>
8 set(_DEFAULT_PLATFORM X11) 8 set(_DEFAULT_PLATFORM X11)
9 option(ENABLE_APP_AUTONAME "Enable renaming the binary according to windowing?" ON)
9else() 10else()
10 string(TOLOWER ${CORE_SYSTEM_NAME} _DEFAULT_PLATFORM) 11 string(TOLOWER ${CORE_SYSTEM_NAME} _DEFAULT_PLATFORM)
11endif() 12endif()
12 13
14set(APP_BINARY_SUFFIX ".bin")
15
13# 16#
14# Note: please do not use CORE_PLATFORM_NAME in any checks, 17# Note: please do not use CORE_PLATFORM_NAME in any checks,
15# use the normalized to lower case CORE_PLATFORM_NAME_LC (see below) instead 18# use the normalized to lower case CORE_PLATFORM_NAME_LC (see below) instead
@@ -23,10 +26,12 @@ string(TOLOWER ${CORE_PLATFORM_NAME} CORE_PLATFORM_NAME_LC)
23list(APPEND final_message "Platform: ${CORE_PLATFORM_NAME}") 26list(APPEND final_message "Platform: ${CORE_PLATFORM_NAME}")
24if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake) 27if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
25 include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake) 28 include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
29 if(ENABLE_APP_AUTONAME)
30 set(APP_BINARY_SUFFIX "-${CORE_PLATFORM_NAME_LC}")
31 endif()
26else() 32else()
27 file(GLOB _platformnames RELATIVE ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/ 33 file(GLOB _platformnames RELATIVE ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/
28 ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake) 34 ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake)
29 string(REPLACE ".cmake" " " _platformnames ${_platformnames}) 35 string(REPLACE ".cmake" " " _platformnames ${_platformnames})
30 message(FATAL_ERROR "invalid CORE_PLATFORM_NAME: ${CORE_PLATFORM_NAME_LC}\nValid platforms: ${_platformnames}") 36 message(FATAL_ERROR "invalid CORE_PLATFORM_NAME: ${CORE_PLATFORM_NAME_LC}\nValid platforms: ${_platformnames}")
31endif() 37endif()
32
diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake
index 5a6066b..1426148 100644
--- a/cmake/scripts/common/PrepareEnv.cmake
+++ b/cmake/scripts/common/PrepareEnv.cmake
@@ -40,17 +40,11 @@ file(COPY ${CORE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake
40 ${CORE_SOURCE_DIR}/cmake/scripts/common/AddOptions.cmake 40 ${CORE_SOURCE_DIR}/cmake/scripts/common/AddOptions.cmake
41 DESTINATION ${APP_LIB_DIR}) 41 DESTINATION ${APP_LIB_DIR})
42 42
43# copy standard add-on include files
44file(COPY ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/
45 DESTINATION ${APP_INCLUDE_DIR} REGEX ".txt" EXCLUDE)
46
47### copy all the addon binding header files to include/kodi 43### copy all the addon binding header files to include/kodi
48# parse addon-bindings.mk to get the list of header files to copy 44include(${CORE_SOURCE_DIR}/xbmc/addons/AddonBindings.cmake)
49core_file_read_filtered(bindings ${CORE_SOURCE_DIR}/xbmc/addons/addon-bindings.mk) 45file(COPY ${CORE_ADDON_BINDINGS_FILES} ${CORE_ADDON_BINDINGS_DIRS}/
50foreach(header ${bindings}) 46 DESTINATION ${APP_INCLUDE_DIR}
51 # copy the header file to include/kodi 47 REGEX ".txt" EXCLUDE)
52 configure_file(${CORE_SOURCE_DIR}/${header} ${APP_INCLUDE_DIR} COPYONLY)
53endforeach()
54 48
55### processing additional tools required by the platform 49### processing additional tools required by the platform
56if(EXISTS ${CORE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/tools/) 50if(EXISTS ${CORE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/tools/)
diff --git a/cmake/scripts/freebsd/ArchSetup.cmake b/cmake/scripts/freebsd/ArchSetup.cmake
index ef693b0..8ee78fc 100644
--- a/cmake/scripts/freebsd/ArchSetup.cmake
+++ b/cmake/scripts/freebsd/ArchSetup.cmake
@@ -1,7 +1,7 @@
1set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_FREEBSD) 1set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_FREEBSD)
2set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE 2set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE
3 -D_FILE_OFFSET_BITS=64) 3 -D_FILE_OFFSET_BITS=64)
4set(PLATFORM_DIR linux) 4set(PLATFORM_DIR platform/linux)
5set(SYSTEM_LDFLAGS -L/usr/local/lib) 5set(SYSTEM_LDFLAGS -L/usr/local/lib)
6if(WITH_ARCH) 6if(WITH_ARCH)
7 set(ARCH ${WITH_ARCH}) 7 set(ARCH ${WITH_ARCH})
@@ -14,3 +14,6 @@ else()
14 message(WARNING "unknown CPU: ${CPU}") 14 message(WARNING "unknown CPU: ${CPU}")
15 endif() 15 endif()
16endif() 16endif()
17
18# Additional SYSTEM_DEFINES
19list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK)
diff --git a/cmake/scripts/freebsd/ExtraTargets.cmake b/cmake/scripts/freebsd/ExtraTargets.cmake
new file mode 100644
index 0000000..66383ab
--- /dev/null
+++ b/cmake/scripts/freebsd/ExtraTargets.cmake
@@ -0,0 +1,29 @@
1# xrandr
2if(X_FOUND AND XRANDR_FOUND)
3 find_package(X QUIET)
4 find_package(XRandR QUIET)
5 add_executable(${APP_NAME_LC}-xrandr ${CMAKE_SOURCE_DIR}/xbmc-xrandr.c)
6 target_link_libraries(${APP_NAME_LC}-xrandr ${SYSTEM_LDFLAGS} ${X_LIBRARIES} m ${XRANDR_LIBRARIES})
7endif()
8
9# WiiRemote
10if(ENABLE_EVENTCLIENTS AND BLUETOOTH_FOUND)
11 find_package(CWiid QUIET)
12 if(CWIID_FOUND)
13 add_subdirectory(${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/WiiRemote build/WiiRemote)
14 endif()
15endif()
16
17if(CORE_PLATFORM_NAME_LC STREQUAL "wayland")
18 # This cannot go into wayland.cmake since it requires the Wayland dependencies
19 # to already be resolved
20 set(PROTOCOL_XMLS "${WAYLAND_PROTOCOLS_DIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml"
21 "${WAYLAND_PROTOCOLS_DIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml")
22 add_custom_command(OUTPUT "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp"
23 COMMAND "${WAYLANDPP_SCANNER}" ${PROTOCOL_XMLS} "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp"
24 DEPENDS "${WAYLANDPP_SCANNER}" ${PROTOCOL_XMLS}
25 COMMENT "Generating wayland-protocols C++ wrappers")
26
27 # Dummy target for dependencies
28 add_custom_target(generate-wayland-extra-protocols DEPENDS wayland-extra-protocols.hpp)
29endif()
diff --git a/cmake/scripts/ios/ArchSetup.cmake b/cmake/scripts/ios/ArchSetup.cmake
index be12c49..0808eb2 100644
--- a/cmake/scripts/ios/ArchSetup.cmake
+++ b/cmake/scripts/ios/ArchSetup.cmake
@@ -7,7 +7,7 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/XBMCApplicatio
7set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS) 7set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS)
8set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE 8set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
9 -D__STDC_CONSTANT_MACROS) 9 -D__STDC_CONSTANT_MACROS)
10set(PLATFORM_DIR linux) 10set(PLATFORM_DIR platform/linux)
11set(CMAKE_SYSTEM_NAME Darwin) 11set(CMAKE_SYSTEM_NAME Darwin)
12if(WITH_ARCH) 12if(WITH_ARCH)
13 set(ARCH ${WITH_ARCH}) 13 set(ARCH ${WITH_ARCH})
@@ -21,6 +21,9 @@ else()
21 endif() 21 endif()
22endif() 22endif()
23 23
24# Additional SYSTEM_DEFINES
25list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK -DHAS_ZEROCONF)
26
24find_package(CXX11 REQUIRED) 27find_package(CXX11 REQUIRED)
25 28
26list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX}) 29list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
diff --git a/cmake/scripts/ios/Install.cmake b/cmake/scripts/ios/Install.cmake
index fee7368..587b24f 100644
--- a/cmake/scripts/ios/Install.cmake
+++ b/cmake/scripts/ios/Install.cmake
@@ -4,6 +4,8 @@ set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-568h@2
4 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-667h@2x.png 4 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-667h@2x.png
5 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-736h@3x.png 5 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-736h@3x.png
6 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-Landscape-736h@3x.png 6 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-Landscape-736h@3x.png
7 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-812h@3x.png
8 ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Default-Landscape-812h@3x.png
7 ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png 9 ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
8 ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png 10 ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
9 ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png 11 ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake
index 74018d0..ee69c09 100644
--- a/cmake/scripts/linux/ArchSetup.cmake
+++ b/cmake/scripts/linux/ArchSetup.cmake
@@ -5,7 +5,7 @@ if(CORE_PLATFORM_NAME_LC STREQUAL rbpi)
5endif() 5endif()
6set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED 6set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED
7 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) 7 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
8set(PLATFORM_DIR linux) 8set(PLATFORM_DIR platform/linux)
9set(CMAKE_SYSTEM_NAME Linux) 9set(CMAKE_SYSTEM_NAME Linux)
10if(WITH_ARCH) 10if(WITH_ARCH)
11 set(ARCH ${WITH_ARCH}) 11 set(ARCH ${WITH_ARCH})
@@ -37,9 +37,32 @@ else()
37 endif() 37 endif()
38endif() 38endif()
39 39
40# Make sure we strip binaries in Release build 40if((CMAKE_BUILD_TYPE STREQUAL Release OR CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
41if(CMAKE_BUILD_TYPE STREQUAL Release AND CMAKE_COMPILER_IS_GNUCXX) 41 AND CMAKE_COMPILER_IS_GNUCXX)
42 # Make sure we strip binaries in Release build
42 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") 43 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
44
45 # LTO Support, requires cmake >= 3.9
46 if(CMAKE_VERSION VERSION_EQUAL 3.9.0 OR CMAKE_VERSION VERSION_GREATER 3.9.0)
47 option(USE_LTO "Enable link time optimization. Specify an int for number of parallel jobs" OFF)
48 if(USE_LTO)
49 include(CheckIPOSupported)
50 check_ipo_supported(RESULT HAVE_LTO OUTPUT _output)
51 if(HAVE_LTO)
52 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
53 # override flags to enable parallel processing
54 set(NJOBS 2)
55 if(USE_LTO MATCHES "^[0-9]+$")
56 set(NJOBS ${USE_LTO})
57 endif()
58 set(CMAKE_CXX_COMPILE_OPTIONS_IPO -flto=${NJOBS} -fno-fat-lto-objects)
59 set(CMAKE_C_COMPILE_OPTIONS_IPO -flto=${NJOBS} -fno-fat-lto-objects)
60 else()
61 message(WARNING "LTO optimization not supported: ${_output}")
62 unset(_output)
63 endif()
64 endif()
65 endif()
43endif() 66endif()
44 67
45if(KODI_DEPENDSBUILD) 68if(KODI_DEPENDSBUILD)
@@ -64,6 +87,9 @@ if(HAVE_MKOSTEMP)
64 list(APPEND ARCH_DEFINES "-DHAVE_MKOSTEMP=1" "-D_GNU_SOURCE") 87 list(APPEND ARCH_DEFINES "-DHAVE_MKOSTEMP=1" "-D_GNU_SOURCE")
65endif() 88endif()
66 89
90# Additional SYSTEM_DEFINES
91list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK)
92
67# Code Coverage 93# Code Coverage
68if(CMAKE_BUILD_TYPE STREQUAL Coverage) 94if(CMAKE_BUILD_TYPE STREQUAL Coverage)
69 set(COVERAGE_TEST_BINARY ${APP_NAME_LC}-test) 95 set(COVERAGE_TEST_BINARY ${APP_NAME_LC}-test)
@@ -78,5 +104,8 @@ endif()
78 104
79if(ENABLE_GBM) 105if(ENABLE_GBM)
80 set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU" FORCE) 106 set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU" FORCE)
81 set(ENABLE_VAAPI OFF CACHE BOOL "Disabling VAAPI" FORCE) 107endif()
108
109if(ENABLE_VDPAU)
110 set(ENABLE_GLX ON CACHE BOOL "Enabling GLX" FORCE)
82endif() 111endif()
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
index 7a2705b..d6767bf 100644
--- a/cmake/scripts/linux/Install.cmake
+++ b/cmake/scripts/linux/Install.cmake
@@ -15,6 +15,7 @@ else()
15endif() 15endif()
16 16
17# CMake config 17# CMake config
18set(APP_BINARY ${APP_NAME_LC}${APP_BINARY_SUFFIX})
18set(APP_PREFIX ${prefix}) 19set(APP_PREFIX ${prefix})
19set(APP_LIB_DIR ${libdir}/${APP_NAME_LC}) 20set(APP_LIB_DIR ${libdir}/${APP_NAME_LC})
20set(APP_DATA_DIR ${datarootdir}/${APP_NAME_LC}) 21set(APP_DATA_DIR ${datarootdir}/${APP_NAME_LC})
@@ -146,17 +147,13 @@ if(NOT WITH_TEXTUREPACKER)
146endif() 147endif()
147 148
148# Install kodi-addon-dev headers 149# Install kodi-addon-dev headers
149install(DIRECTORY ${CMAKE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/ 150include(${CMAKE_SOURCE_DIR}/xbmc/addons/AddonBindings.cmake)
151install(DIRECTORY ${CORE_ADDON_BINDINGS_DIRS}/
150 DESTINATION ${includedir}/${APP_NAME_LC} 152 DESTINATION ${includedir}/${APP_NAME_LC}
151 COMPONENT kodi-addon-dev 153 COMPONENT kodi-addon-dev
152 REGEX ".txt" EXCLUDE) 154 REGEX ".txt" EXCLUDE)
153 155
154install(FILES ${CMAKE_SOURCE_DIR}/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h 156install(FILES ${CORE_ADDON_BINDINGS_FILES}
155 ${CMAKE_SOURCE_DIR}/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h
156 ${CMAKE_SOURCE_DIR}/xbmc/cores/AudioEngine/Utils/AEChannelData.h
157 ${CMAKE_SOURCE_DIR}/xbmc/filesystem/IFileTypes.h
158 ${CMAKE_SOURCE_DIR}/xbmc/input/ActionIDs.h
159 ${CMAKE_SOURCE_DIR}/xbmc/input/XBMC_vkeys.h
160 DESTINATION ${includedir}/${APP_NAME_LC} 157 DESTINATION ${includedir}/${APP_NAME_LC}
161 COMPONENT kodi-addon-dev) 158 COMPONENT kodi-addon-dev)
162 159
@@ -178,7 +175,7 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cm
178 COMPONENT kodi-addon-dev) 175 COMPONENT kodi-addon-dev)
179 176
180if(ENABLE_EVENTCLIENTS) 177if(ENABLE_EVENTCLIENTS)
181 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='')" 178 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=''))"
182 OUTPUT_VARIABLE PYTHON_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) 179 OUTPUT_VARIABLE PYTHON_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
183 # Install kodi-eventclients-common BT python files 180 # Install kodi-eventclients-common BT python files
184 install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py 181 install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py
diff --git a/cmake/scripts/linux/clang-check-test.sh.in b/cmake/scripts/linux/clang-check-test.sh.in
index 3b30ec1..12e9a0e 100755
--- a/cmake/scripts/linux/clang-check-test.sh.in
+++ b/cmake/scripts/linux/clang-check-test.sh.in
@@ -12,7 +12,7 @@ source_file=$2
12 12
13tmpfil=`mktemp` 13tmpfil=`mktemp`
14$clangcheck_cmd -p @CMAKE_BINARY_DIR@ -analyze $source_file &> $tmpfil 14$clangcheck_cmd -p @CMAKE_BINARY_DIR@ -analyze $source_file &> $tmpfil
15nerr=`cat $tmpfil | grep -v "warning: /usr/bin/c++: 'linker' input unused" | wc -l` 15nerr=`cat $tmpfil | grep -v "warning: .*: 'linker' input unused" | wc -l`
16if test $nerr -gt 0 16if test $nerr -gt 0
17then 17then
18 cat $tmpfil 18 cat $tmpfil
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake
index 5a1b567..d0c5506 100644
--- a/cmake/scripts/osx/ArchSetup.cmake
+++ b/cmake/scripts/osx/ArchSetup.cmake
@@ -9,7 +9,7 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp
9set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX) 9set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX)
10set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE 10set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
11 -D__STDC_CONSTANT_MACROS) 11 -D__STDC_CONSTANT_MACROS)
12set(PLATFORM_DIR linux) 12set(PLATFORM_DIR platform/linux)
13set(CMAKE_SYSTEM_NAME Darwin) 13set(CMAKE_SYSTEM_NAME Darwin)
14if(WITH_ARCH) 14if(WITH_ARCH)
15 set(ARCH ${WITH_ARCH}) 15 set(ARCH ${WITH_ARCH})
@@ -22,6 +22,9 @@ else()
22 endif() 22 endif()
23endif() 23endif()
24 24
25# Additional SYSTEM_DEFINES
26list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK -DHAS_SDL -DHAS_ZEROCONF)
27
25find_package(CXX11 REQUIRED) 28find_package(CXX11 REQUIRED)
26 29
27list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX}) 30list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake
index d438b05..8e4f61d 100644
--- a/cmake/scripts/windows/ArchSetup.cmake
+++ b/cmake/scripts/windows/ArchSetup.cmake
@@ -17,14 +17,15 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/WinMain.cpp)
17 17
18# Precompiled headers fail with per target output directory. (needs CMake 3.1) 18# Precompiled headers fail with per target output directory. (needs CMake 3.1)
19set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs) 19set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs)
20
21set(CMAKE_SYSTEM_NAME Windows) 20set(CMAKE_SYSTEM_NAME Windows)
22list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/mingwlibs/${ARCH}) 21set(DEPS_FOLDER_RELATIVE project/BuildDependencies)
23list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/mingwlibs/${ARCH}/bin) 22set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/${ARCH})
24list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}) 23set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH})
25list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies)
26set(PYTHON_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}/include/python)
27 24
25list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${MINGW_LIBS_DIR})
26list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
27list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${DEPENDENCIES_DIR})
28set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
28 29
29# -------- Compiler options --------- 30# -------- Compiler options ---------
30 31
@@ -41,6 +42,9 @@ if(${ARCH} STREQUAL win32)
41 list(APPEND SYSTEM_DEFINES $<$<CONFIG:Debug>:-D_ITERATOR_DEBUG_LEVEL=0>) 42 list(APPEND SYSTEM_DEFINES $<$<CONFIG:Debug>:-D_ITERATOR_DEBUG_LEVEL=0>)
42endif() 43endif()
43 44
45# Additional SYSTEM_DEFINES
46list(APPEND SYSTEM_DEFINES -DHAS_IRSERVERSUITE -DHAS_WIN32_NETWORK -DHAS_FILESYSTEM_SMB)
47
44# Make sure /FS is set for Visual Studio in order to prevent simultaneous access to pdb files. 48# Make sure /FS is set for Visual Studio in order to prevent simultaneous access to pdb files.
45if(CMAKE_GENERATOR MATCHES "Visual Studio") 49if(CMAKE_GENERATOR MATCHES "Visual Studio")
46 set(CMAKE_CXX_FLAGS "/MP /FS ${CMAKE_CXX_FLAGS}") 50 set(CMAKE_CXX_FLAGS "/MP /FS ${CMAKE_CXX_FLAGS}")
@@ -56,14 +60,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
56 60
57# For #pragma comment(lib X) 61# For #pragma comment(lib X)
58# TODO: It would certainly be better to handle these libraries via CMake modules. 62# TODO: It would certainly be better to handle these libraries via CMake modules.
59if(${ARCH} STREQUAL win32) 63link_directories(${DEPENDENCIES_DIR}/lib)
60 link_directories(${CMAKE_SOURCE_DIR}/lib/win32/ffmpeg/bin
61 ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}/lib
62 ${CMAKE_SOURCE_DIR}/project/BuildDependencies/lib)
63else()
64 link_directories(${CMAKE_SOURCE_DIR}/lib/win32/ffmpeg/bin
65 ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}/lib)
66endif()
67 64
68# Additional libraries 65# Additional libraries
69list(APPEND DEPLIBS d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib 66list(APPEND DEPLIBS d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
new file mode 100644
index 0000000..6c6622c
--- /dev/null
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -0,0 +1,121 @@
1# -------- Architecture settings ---------
2
3check_symbol_exists(_X86_ "Windows.h" _X86_)
4check_symbol_exists(_AMD64_ "Windows.h" _AMD64_)
5check_symbol_exists(_ARM_ "Windows.h" _ARM_)
6
7if(_X86_)
8 set(ARCH win32)
9 set(SDK_TARGET_ARCH x86)
10elseif(_AMD64_)
11 set(ARCH x64)
12 set(SDK_TARGET_ARCH x64)
13elseif(_ARM_)
14 set(ARCH arm)
15 set(SDK_TARGET_ARCH arm)
16else()
17 message(FATAL_ERROR "Unsupported architecture")
18endif()
19
20unset(_X86_)
21unset(_AMD64_)
22unset(_ARM_)
23
24# -------- Paths (mainly for find_package) ---------
25
26set(PLATFORM_DIR platform/win32)
27set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win10/main.cpp)
28
29# Precompiled headers fail with per target output directory. (needs CMake 3.1)
30set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs)
31
32set(CMAKE_SYSTEM_NAME WindowsStore)
33set(CORE_SYSTEM_NAME "windowsstore")
34set(PACKAGE_GUID "281d668b-5739-4abd-b3c2-ed1cda572ed2")
35set(APP_MANIFEST_NAME package.appxmanifest)
36set(DEPS_FOLDER_RELATIVE project/BuildDependencies)
37
38set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win10-${ARCH})
39set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH})
40
41# mingw libs
42list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${MINGW_LIBS_DIR})
43list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
44# dependencies
45list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${DEPENDENCIES_DIR})
46# for python
47set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
48
49
50# -------- Compiler options ---------
51
52add_options(CXX ALL_BUILDS "/wd\"4996\"")
53add_options(CXX ALL_BUILDS "/wd\"4146\"")
54add_options(CXX ALL_BUILDS "/wd\"4251\"")
55add_options(CXX ALL_BUILDS "/wd\"4668\"")
56set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DXBMC_EXPORT -DMS_UWP)
57if(NOT SDK_TARGET_ARCH STREQUAL arm)
58 list(APPEND ARCH_DEFINES -D__SSE__ -D__SSE2__)
59endif()
60set(SYSTEM_DEFINES -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS
61 -DFMT_HEADER_ONLY -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING
62 -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi"
63 -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi"
64 -DUNICODE -D_UNICODE
65 $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
66
67# Additional SYSTEM_DEFINES
68list(APPEND SYSTEM_DEFINES -DHAS_IRSERVERSUITE -DHAS_WIN10_NETWORK)
69
70# The /MP option enables /FS by default.
71set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /ZW /EHsc /await")
72# Google Test needs to use shared version of runtime libraries
73set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
74
75
76# -------- Linker options ---------
77
78# For #pragma comment(lib X)
79# TODO: It would certainly be better to handle these libraries via CMake modules.
80link_directories(${MINGW_LIBS_DIR}/lib
81 ${DEPENDENCIES_DIR}/lib)
82
83list(APPEND DEPLIBS d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib)
84if(ARCH STREQUAL win32 OR ARCH STREQUAL x64)
85 list(APPEND DEPLIBS DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib PowrProf.lib setupapi.lib dwmapi.lib)
86endif()
87# NODEFAULTLIB option
88
89set(_nodefaultlibs_RELEASE libcmt)
90set(_nodefaultlibs_DEBUG libcmt msvcrt)
91foreach(_lib ${_nodefaultlibs_RELEASE})
92 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:\"${_lib}\"")
93endforeach()
94foreach(_lib ${_nodefaultlibs_DEBUG})
95 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:\"${_lib}\"")
96endforeach()
97
98# Make the Release version create a PDB
99set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
100# Minimize the size or the resulting DLLs
101set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF")
102# remove warning
103set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4264")
104
105
106# -------- Visual Studio options ---------
107
108if(CMAKE_GENERATOR MATCHES "Visual Studio")
109 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
110
111 # Generate a batch file that opens Visual Studio with the necessary env variables set.
112 file(WRITE ${CMAKE_BINARY_DIR}/kodi-sln.bat
113 "@echo off\n"
114 "set KODI_HOME=%~dp0\n"
115 "set PATH=%~dp0\\system\n"
116 "start %~dp0\\${PROJECT_NAME}.sln")
117endif()
118
119# -------- Build options ---------
120
121set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
diff --git a/cmake/scripts/windowsstore/CFlagOverrides.cmake b/cmake/scripts/windowsstore/CFlagOverrides.cmake
new file mode 100644
index 0000000..0cd1c4d
--- /dev/null
+++ b/cmake/scripts/windowsstore/CFlagOverrides.cmake
@@ -0,0 +1,12 @@
1# compiler flags
2string(APPEND CMAKE_C_FLAGS_INIT " /D_UNICODE /DUNICODE /MP /DWIN32 /D_WINDOWS /W3 /Zi /DTARGET_WINDOWS")
3string(APPEND CMAKE_C_FLAGS_INIT " /DWINAPI_FAMILY=2 /DTARGET_WINDOWS_STORE /D_WINSOCK_DEPRECATED_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE")
4string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " /D_DEBUG /MDd /Ob0 /Od /RTC1 /D_ITERATOR_DEBUG_LEVEL=0")
5string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " /MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG")
6# linker flags
7string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " /DYNAMICBASE /NXCOMPAT /APPCONTAINER")
8# win32 specific flags
9if("$ENV{Platform}" STREQUAL X86)
10 string(APPEND CMAKE_C_FLAGS_INIT " /arch:SSE2")
11 string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " /SAFESEH")
12endif()
diff --git a/cmake/scripts/windowsstore/CXXFlagOverrides.cmake b/cmake/scripts/windowsstore/CXXFlagOverrides.cmake
new file mode 100644
index 0000000..2219af4
--- /dev/null
+++ b/cmake/scripts/windowsstore/CXXFlagOverrides.cmake
@@ -0,0 +1,12 @@
1# compiler flags
2string(APPEND CMAKE_CXX_FLAGS_INIT " /D_UNICODE /DUNICODE /MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /DTARGET_WINDOWS")
3string(APPEND CMAKE_CXX_FLAGS_INIT " /DWINAPI_FAMILY=2 /DTARGET_WINDOWS_STORE /D_WINSOCK_DEPRECATED_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE")
4string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " /D_DEBUG /MDd /Ob0 /Od /RTC1 /D_ITERATOR_DEBUG_LEVEL=0")
5string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " /MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG")
6# linker flags
7string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " /DYNAMICBASE /NXCOMPAT /APPCONTAINER")
8# win32 specific flags
9if("$ENV{Platform}" STREQUAL X86)
10 string(APPEND CMAKE_CXX_FLAGS_INIT " /arch:SSE2")
11 string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " /SAFESEH")
12endif()
diff --git a/cmake/scripts/windowsstore/Install.cmake b/cmake/scripts/windowsstore/Install.cmake
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cmake/scripts/windowsstore/Install.cmake
diff --git a/cmake/scripts/windowsstore/Macros.cmake b/cmake/scripts/windowsstore/Macros.cmake
new file mode 100644
index 0000000..6e7d1d0
--- /dev/null
+++ b/cmake/scripts/windowsstore/Macros.cmake
@@ -0,0 +1,181 @@
1function(core_link_library lib wraplib)
2 message(AUTHOR_WARNING "core_link_library is not compatible with windows.")
3endfunction()
4
5function(find_soname lib)
6 # Windows uses hardcoded dlls in xbmc/DllPaths_win32.h.
7 # Therefore the output of this function is unused.
8endfunction()
9
10# Add precompiled header to target
11# Arguments:
12# target existing target that will be set up to compile with a precompiled header
13# pch_header the precompiled header file
14# pch_source the precompiled header source file
15# Optional Arguments:
16# PCH_TARGET build precompiled header as separate target with the given name
17# so that the same precompiled header can be used for multiple libraries
18# EXCLUDE_SOURCES if not all target sources shall use the precompiled header,
19# the relevant files can be listed here
20# On return:
21# Compiles the pch_source into a precompiled header and adds the header to
22# the given target
23function(add_precompiled_header target pch_header pch_source)
24 cmake_parse_arguments(PCH "" "PCH_TARGET" "EXCLUDE_SOURCES" ${ARGN})
25
26 if(PCH_PCH_TARGET)
27 set(pch_binary ${PRECOMPILEDHEADER_DIR}/${PCH_PCH_TARGET}.pch)
28 else()
29 set(pch_binary ${PRECOMPILEDHEADER_DIR}/${target}.pch)
30 endif()
31
32 # Set compile options and dependency for sources
33 get_target_property(sources ${target} SOURCES)
34 list(REMOVE_ITEM sources ${pch_source})
35 foreach(exclude_source IN LISTS PCH_EXCLUDE_SOURCES)
36 list(REMOVE_ITEM sources ${exclude_source})
37 endforeach()
38 set_source_files_properties(${sources}
39 PROPERTIES COMPILE_FLAGS "/Yu\"${pch_header}\" /Fp\"${pch_binary}\" /FI\"${pch_header}\""
40 OBJECT_DEPENDS "${pch_binary}")
41
42 # Set compile options for precompiled header
43 if(NOT PCH_PCH_TARGET OR NOT TARGET ${PCH_PCH_TARGET}_pch)
44 set_source_files_properties(${pch_source}
45 PROPERTIES COMPILE_FLAGS "/Yc\"${pch_header}\" /Fp\"${pch_binary}\""
46 OBJECT_OUTPUTS "${pch_binary}")
47 endif()
48
49 # Compile precompiled header
50 if(PCH_PCH_TARGET)
51 # As own target for usage in multiple libraries
52 if(NOT TARGET ${PCH_PCH_TARGET}_pch)
53 add_library(${PCH_PCH_TARGET}_pch STATIC ${pch_source})
54 set_target_properties(${PCH_PCH_TARGET}_pch PROPERTIES COMPILE_PDB_NAME vc140
55 COMPILE_PDB_OUTPUT_DIRECTORY ${PRECOMPILEDHEADER_DIR}
56 FOLDER "Build Utilities")
57 endif()
58 # From VS2012 onwards, precompiled headers have to be linked against (LNK2011).
59 target_link_libraries(${target} PUBLIC ${PCH_PCH_TARGET}_pch)
60 set_target_properties(${target} PROPERTIES COMPILE_PDB_NAME vc140
61 COMPILE_PDB_OUTPUT_DIRECTORY ${PRECOMPILEDHEADER_DIR})
62 else()
63 # As part of the target
64 target_sources(${target} PRIVATE ${pch_source})
65 endif()
66endfunction()
67
68macro(winstore_set_assets target)
69 file(GLOB ASSET_FILES "${CMAKE_SOURCE_DIR}/tools/windows/packaging/uwp/media/*.png")
70 set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
71 set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "media")
72 source_group("media" FILES ${ASSET_FILES})
73 set(RESOURCES ${RESOURCES} ${ASSET_FILES}
74 "${CMAKE_SOURCE_DIR}/tools/windows/packaging/uwp/kodi_temp_key.pfx")
75 set(LICENSE_FILES
76 ${CMAKE_SOURCE_DIR}/LICENSE.GPL
77 ${CMAKE_SOURCE_DIR}/copying.txt
78 ${CMAKE_SOURCE_DIR}/privacy-policy.txt)
79 if(EXISTS "${CMAKE_SOURCE_DIR}/known_issues.txt")
80 list(APPEND LICENSE_FILES ${CMAKE_SOURCE_DIR}/known_issues.txt)
81 endif()
82 set_property(SOURCE ${LICENSE_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
83 list(APPEND RESOURCES ${LICENSE_FILES})
84endmacro()
85
86macro(winstore_generate_manifest target)
87 configure_file(
88 ${CMAKE_SOURCE_DIR}/tools/windows/packaging/uwp/${APP_MANIFEST_NAME}.in
89 ${CMAKE_CURRENT_BINARY_DIR}/${APP_MANIFEST_NAME}
90 @ONLY)
91 set(RESOURCES ${RESOURCES} ${CMAKE_CURRENT_BINARY_DIR}/${APP_MANIFEST_NAME})
92endmacro()
93
94macro(add_deployment_content_group path link match exclude)
95 set(_link "")
96 set(_exclude "")
97 file(TO_NATIVE_PATH ${path} _path)
98 file(TO_NATIVE_PATH ${match} _match)
99 if (NOT "${link}" STREQUAL "")
100 file(TO_NATIVE_PATH ${link} _link)
101 set(_link "${_link}\\")
102 endif()
103 if(NOT "${exclude}" STREQUAL "")
104 string(REPLACE "/" "\\" _exclude ${exclude})
105 endif()
106 string(CONCAT UWP_DEPLOYMENT_CONTENT_STR "${UWP_DEPLOYMENT_CONTENT_STR}"
107 " <EmbedResources Include=\"${_path}\\${_match}\" Exclude=\"${_exclude}\">\n"
108 " <Link>${_link}%(RecursiveDir)%(FileName)%(Extension)</Link>\n"
109 " <DeploymentContent>true</DeploymentContent>\n"
110 " </EmbedResources>\n")
111endmacro()
112
113macro(winstore_append_props target)
114 # exclude debug dlls from packaging
115 set(DEBUG_DLLS zlibd.dll freetyped.dll sqlite3d.dll)
116 foreach(_dll ${DEBUG_DLLS})
117 if (DEBUG_DLLS_EXCLUDE)
118 list(APPEND DEBUG_DLLS_EXCLUDE "\;$(BuildRootPath)/dlls/${_dll}")
119 else()
120 list(APPEND DEBUG_DLLS_EXCLUDE "$(BuildRootPath)/dlls/${_dll}")
121 endif()
122 string(CONCAT DEBUG_DLLS_LINKAGE_PROPS "${DEBUG_DLLS_LINKAGE_PROPS}"
123 " <ItemGroup Label=\"Binaries\">\n"
124 " <None Include=\"$(BinPath)\\${_dll}\" Condition=\"'$(Configuration)'=='Debug'\">\n"
125 " <DeploymentContent>true</DeploymentContent>\n"
126 " </None>\n"
127 " </ItemGroup>\n")
128 endforeach(_dll DEBUG_DLLS)
129
130 add_deployment_content_group($(BuildRootPath)/dlls "" *.dll "${DEBUG_DLLS_EXCLUDE}")
131 add_deployment_content_group($(BuildRootPath)/system system **/* "$(BuildRootPath)/**/*.glsl")
132 add_deployment_content_group($(BuildRootPath)/media media **/* "")
133 add_deployment_content_group($(BuildRootPath)/userdata userdata **/* "")
134 add_deployment_content_group($(BuildRootPath)/addons addons **/* "")
135 add_deployment_content_group($(BinaryAddonsPath) addons **/* "")
136
137 foreach(xbt_file ${XBT_FILES})
138 file(RELATIVE_PATH relative ${CMAKE_CURRENT_BINARY_DIR} ${xbt_file})
139 file(TO_NATIVE_PATH ${relative} relative)
140 string(CONCAT XBT_FILE_PROPS "${XBT_FILE_PROPS}"
141 " <ItemGroup Label=\"SkinsMedia\">\n"
142 " <None Include=\"$(BuildRootPath)\\${relative}\">\n"
143 " <Link>${relative}</Link>\n"
144 " <DeploymentContent>true</DeploymentContent>\n"
145 " </None>\n"
146 " </ItemGroup>\n")
147 endforeach()
148
149 set(VCPROJECT_PROPS_FILE "${CMAKE_CURRENT_BINARY_DIR}/${target}.props")
150 file(TO_NATIVE_PATH ${DEPENDENCIES_DIR} DEPENDENCIES_DIR_NATIVE)
151 file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} CMAKE_CURRENT_BINARY_DIR_NATIVE)
152 file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/project/Win32BuildSetup/BUILD_WIN32/addons BINARY_ADDONS_DIR_NATIVE)
153
154 file(WRITE ${VCPROJECT_PROPS_FILE}
155 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
156 "<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
157 " <ImportGroup Label=\"PropertySheets\" />\n"
158 " <PropertyGroup Label=\"APP_DLLS\">\n"
159 " <BinPath>${DEPENDENCIES_DIR_NATIVE}\\bin</BinPath>\n"
160 " <BuildRootPath>${CMAKE_CURRENT_BINARY_DIR_NATIVE}</BuildRootPath>\n"
161 " <BinaryAddonsPath>${BINARY_ADDONS_DIR_NATIVE}</BinaryAddonsPath>\n"
162 " </PropertyGroup>\n"
163 "${DEBUG_DLLS_LINKAGE_PROPS}"
164 "${XBT_FILE_PROPS}"
165 " <ItemGroup>\n"
166 "${UWP_DEPLOYMENT_CONTENT_STR}"
167 " </ItemGroup>\n"
168 " <Target Name=\"_CollectCustomResources\" Inputs=\"@(EmbedResources)\" Outputs=\"@(EmbedResources->'$(OutputPath)\\PackageLayout\\%(Link)')\" BeforeTargets=\"AssignTargetPaths\">\n"
169 " <Message Text=\"Collecting package resources...\"/>\n"
170 " <ItemGroup>\n"
171 " <None Include=\"@(EmbedResources)\" />\n"
172 " </ItemGroup>\n"
173 " </Target>\n"
174 "</Project>")
175endmacro()
176
177macro(winstore_add_target_properties target)
178 winstore_set_assets(${target})
179 winstore_generate_manifest(${target})
180 winstore_append_props(${target})
181endmacro() \ No newline at end of file
diff --git a/cmake/scripts/windowsstore/PathSetup.cmake b/cmake/scripts/windowsstore/PathSetup.cmake
new file mode 100644
index 0000000..8550616
--- /dev/null
+++ b/cmake/scripts/windowsstore/PathSetup.cmake
@@ -0,0 +1,34 @@
1if(NOT prefix)
2 set(prefix ${CMAKE_INSTALL_PREFIX})
3else()
4 set(CMAKE_INSTALL_PREFIX ${prefix})
5endif()
6if(NOT exec_prefix)
7 set(exec_prefix ${prefix})
8endif()
9if(NOT libdir)
10 set(libdir ${prefix}/lib)
11endif()
12if(NOT bindir)
13 set(bindir ${prefix}/bin)
14endif()
15if(NOT includedir)
16 set(includedir ${prefix}/include)
17endif()
18if(NOT datarootdir)
19 set(datarootdir ${prefix}/share)
20endif()
21if(NOT datadir)
22 set(datadir ${datarootdir})
23endif()
24
25list(APPEND final_message "-- PATH config --")
26list(APPEND final_message "Prefix: ${prefix}")
27list(APPEND final_message "Libdir: ${libdir}")
28list(APPEND final_message "Bindir: ${bindir}")
29list(APPEND final_message "Includedir: ${includedir}")
30list(APPEND final_message "Datarootdir: ${datarootdir}")
31list(APPEND final_message "Datadir: ${datadir}")
32
33set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\"
34 -DINSTALL_PATH=\"${datarootdir}/kodi\")
diff --git a/cmake/scripts/windowsstore/tools/patch.cmake b/cmake/scripts/windowsstore/tools/patch.cmake
new file mode 100644
index 0000000..0a342fa
--- /dev/null
+++ b/cmake/scripts/windowsstore/tools/patch.cmake
@@ -0,0 +1,37 @@
1find_program(PATCH_FOUND NAMES patch patch.exe)
2if(PATCH_FOUND)
3 message(STATUS "patch utility found at ${PATCH_FOUND}")
4else()
5 set(PATCH_ARCHIVE_NAME "patch-2.5.9-7-bin-3")
6 set(PATCH_ARCHIVE "${PATCH_ARCHIVE_NAME}.zip")
7 set(PATCH_URL "${KODI_MIRROR}/build-deps/win32/${PATCH_ARCHIVE}")
8 set(PATCH_DOWNLOAD ${BUILD_DIR}/download/${PATCH_ARCHIVE})
9
10 # download the archive containing patch.exe
11 message(STATUS "Downloading patch utility from ${PATCH_URL}...")
12 file(DOWNLOAD "${PATCH_URL}" "${PATCH_DOWNLOAD}" STATUS PATCH_DL_STATUS LOG PATCH_LOG SHOW_PROGRESS)
13 list(GET PATCH_DL_STATUS 0 PATCH_RETCODE)
14 if(NOT PATCH_RETCODE EQUAL 0)
15 message(FATAL_ERROR "ERROR downloading ${PATCH_URL} - status: ${PATCH_DL_STATUS} log: ${PATCH_LOG}")
16 endif()
17
18 # extract the archive containing patch.exe
19 execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzvf ${PATCH_DOWNLOAD}
20 WORKING_DIRECTORY ${BUILD_DIR})
21
22 # make sure the extraction worked and that patch.exe is there
23 set(PATCH_PATH ${BUILD_DIR}/${PATCH_ARCHIVE_NAME})
24 set(PATCH_BINARY_PATH ${PATCH_PATH}/bin/patch.exe)
25 if(NOT EXISTS ${PATCH_PATH} OR NOT EXISTS ${PATCH_BINARY_PATH})
26 message(FATAL_ERROR "ERROR extracting patch utility from ${PATCH_PATH}")
27 endif()
28
29 # copy patch.exe into the output directory
30 file(INSTALL ${PATCH_BINARY_PATH} DESTINATION ${ADDON_DEPENDS_PATH}/bin)
31
32 # make sure that cmake can find the copied patch.exe
33 find_program(PATCH_FOUND NAMES patch patch.exe)
34 if(NOT PATCH_FOUND)
35 message(FATAL_ERROR "ERROR installing patch utility from ${PATCH_BINARY_PATH} to ${ADDON_DEPENDS_PATH}/bin")
36 endif()
37endif()
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-12 23:36:48 +0000