diff options
Diffstat (limited to 'cmake/scripts/common/HandleDepends.cmake')
| -rw-r--r-- | cmake/scripts/common/HandleDepends.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
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) |
