From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 24 Nov 2016 21:27:41 +0100 Subject: sync with upstream --- .../cmake/addons/depends/windows/CMakeLists.txt | 23 +++++++++------------ .../cmake/addons/depends/windows/Find7Zip.cmake | 7 ------- project/cmake/addons/depends/windows/Install.cmake | 24 ++++++++++++++++++++++ .../cmake/addons/depends/windows/extract-7z.cmake | 10 --------- .../addons/depends/windows/extract-direct.cmake | 2 -- project/cmake/addons/depends/windows/install.cmake | 24 ---------------------- 6 files changed, 34 insertions(+), 56 deletions(-) delete mode 100644 project/cmake/addons/depends/windows/Find7Zip.cmake create mode 100644 project/cmake/addons/depends/windows/Install.cmake delete mode 100644 project/cmake/addons/depends/windows/extract-7z.cmake delete mode 100644 project/cmake/addons/depends/windows/extract-direct.cmake delete mode 100644 project/cmake/addons/depends/windows/install.cmake (limited to 'project/cmake/addons/depends/windows') diff --git a/project/cmake/addons/depends/windows/CMakeLists.txt b/project/cmake/addons/depends/windows/CMakeLists.txt index 4480f1e..c8739c0 100644 --- a/project/cmake/addons/depends/windows/CMakeLists.txt +++ b/project/cmake/addons/depends/windows/CMakeLists.txt @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.1) project(kodi-addons-depends-windows) -cmake_minimum_required(VERSION 2.8) - list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) if(NOT CMAKE_BUILD_TYPE) @@ -10,13 +9,13 @@ endif() include(ExternalProject) -if(NOT DEPENDS_PATH) - message(FATAL_ERROR "DEPENDS_PATH (${DEPENDS_PATH}) is not a valid target directory.") +if(NOT ADDON_DEPENDS_PATH) + message(FATAL_ERROR "ADDON_DEPENDS_PATH (${ADDON_DEPENDS_PATH}) is not a valid target directory.") else() - file(TO_CMAKE_PATH "${DEPENDS_PATH}" DEPENDS_PATH) + file(TO_CMAKE_PATH "${ADDON_DEPENDS_PATH}" ADDON_DEPENDS_PATH) endif() -get_filename_component(DEPENDS_PATH "${DEPENDS_PATH}" ABSOLUTE) -list(APPEND CMAKE_PREFIX_PATH ${DEPENDS_PATH}) +get_filename_component(ADDON_DEPENDS_PATH "${ADDON_DEPENDS_PATH}" ABSOLUTE) +list(APPEND CMAKE_PREFIX_PATH ${ADDON_DEPENDS_PATH}) if(NOT DEPENDS_TO_BUILD) set(DEPENDS_TO_BUILD "all") @@ -31,19 +30,17 @@ function(add_internal id url inputfile) INSTALL_COMMAND ${CMAKE_COMMAND} -DINPUTDIR=${PROJECT_BINARY_DIR}/build/${id}/src/${id} -DINPUTFILE=${inputfile} - -DDESTDIR=${DEPENDS_PATH} - -P ${PROJECT_SOURCE_DIR}/install.cmake + -DDESTDIR=${ADDON_DEPENDS_PATH} + -P ${PROJECT_SOURCE_DIR}/Install.cmake ) endfunction() -#find_package(7Zip REQUIRED) - file(GLOB_RECURSE download_input_files prebuilt/*.txt) foreach(file ${download_input_files}) if(NOT file MATCHES install.txt) file(STRINGS ${file} def) - get_filename_component(dir ${file} PATH) - separate_arguments(def) + get_filename_component(dir ${file} DIRECTORY) + string(REPLACE " " ";" def ${def}) list(GET def 0 id) list(FIND DEPENDS_TO_BUILD ${id} idx) diff --git a/project/cmake/addons/depends/windows/Find7Zip.cmake b/project/cmake/addons/depends/windows/Find7Zip.cmake deleted file mode 100644 index 82b0902..0000000 --- a/project/cmake/addons/depends/windows/Find7Zip.cmake +++ /dev/null @@ -1,7 +0,0 @@ -find_program(7ZIP_EXECUTABLE NAMES 7z.exe - HINTS PATHS "c:/Program Files/7-Zip") - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(7Zip DEFAULT_MSG 7ZIP_EXECUTABLE) - -mark_as_advanced(7ZIP_EXECUTABLE) diff --git a/project/cmake/addons/depends/windows/Install.cmake b/project/cmake/addons/depends/windows/Install.cmake new file mode 100644 index 0000000..9a3adbb --- /dev/null +++ b/project/cmake/addons/depends/windows/Install.cmake @@ -0,0 +1,24 @@ +if(EXISTS "${INPUTFILE}") + # if there's an input file we use it to determine which files to copy where + file(STRINGS ${INPUTFILE} FILES) + string(REPLACE "\n" ";" FILES "${FILES}") + foreach(file ${FILES}) + string(REPLACE " " ";" file "${file}") + list(GET file 0 dir) + list(GET file 1 dest) + list(LENGTH file deflength) + if(deflength GREATER 2) + list(GET file 2 copy) + endif() + file(GLOB files ${INPUTDIR}/${dir}) + foreach(instfile ${files}) + file(COPY ${instfile} DESTINATION ${DESTDIR}/${dest}) + if(copy) + file(COPY ${instfile} DESTINATION ${DESTDIR}/${copy}) + endif() + endforeach() + endforeach() +else() + # otherwise we assume that the content of the extracted archive is already well-formed and can just be copied + file(COPY ${INPUTDIR}/${dir} DESTINATION ${DESTDIR}) +endif() \ No newline at end of file diff --git a/project/cmake/addons/depends/windows/extract-7z.cmake b/project/cmake/addons/depends/windows/extract-7z.cmake deleted file mode 100644 index 95a2672..0000000 --- a/project/cmake/addons/depends/windows/extract-7z.cmake +++ /dev/null @@ -1,10 +0,0 @@ -get_filename_component(file ${URL} NAME) -file(DOWNLOAD ${URL} ${DEST}/${file}) -execute_process(COMMAND ${7ZIP_EXECUTABLE} -y x ${DEST}/${file} - WORKING_DIRECTORY ${DESTDIR}) -if(${file} MATCHES .tar) - string(REPLACE ".7z" "" tarball ${file}) - string(REPLACE ".lzma" "" tarball ${file}) - execute_process(COMMAND ${7ZIP_EXECUTABLE} -y x ${DESTDIR}/${tarball} - WORKING_DIRECTORY ${DESTDIR}) -endif() diff --git a/project/cmake/addons/depends/windows/extract-direct.cmake b/project/cmake/addons/depends/windows/extract-direct.cmake deleted file mode 100644 index 13cb74f..0000000 --- a/project/cmake/addons/depends/windows/extract-direct.cmake +++ /dev/null @@ -1,2 +0,0 @@ -get_filename_component(file ${URL} NAME) -file(DOWNLOAD ${URL} ${DEST}/${file}) diff --git a/project/cmake/addons/depends/windows/install.cmake b/project/cmake/addons/depends/windows/install.cmake deleted file mode 100644 index 9a3adbb..0000000 --- a/project/cmake/addons/depends/windows/install.cmake +++ /dev/null @@ -1,24 +0,0 @@ -if(EXISTS "${INPUTFILE}") - # if there's an input file we use it to determine which files to copy where - file(STRINGS ${INPUTFILE} FILES) - string(REPLACE "\n" ";" FILES "${FILES}") - foreach(file ${FILES}) - string(REPLACE " " ";" file "${file}") - list(GET file 0 dir) - list(GET file 1 dest) - list(LENGTH file deflength) - if(deflength GREATER 2) - list(GET file 2 copy) - endif() - file(GLOB files ${INPUTDIR}/${dir}) - foreach(instfile ${files}) - file(COPY ${instfile} DESTINATION ${DESTDIR}/${dest}) - if(copy) - file(COPY ${instfile} DESTINATION ${DESTDIR}/${copy}) - endif() - endforeach() - endforeach() -else() - # otherwise we assume that the content of the extracted archive is already well-formed and can just be copied - file(COPY ${INPUTDIR}/${dir} DESTINATION ${DESTDIR}) -endif() \ No newline at end of file -- cgit v1.2.3