Merge remote-tracking branch 'upstream/master' into double-conversion

NukeBird · Sep 14, 2017 · 581700a · 581700a
2 parents 9036adc + 0dc25c6
commit 581700a
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 171 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ language:
 
 os:
   - linux
-  - osx
 
 # Container-based infrastructure (Linux)
 # * https://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F
@@ -25,29 +24,6 @@ dist:
   - trusty
 
 env:
-  - PROJECT_DIR=tests/simple TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/22 TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/24/unit TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/107 TOOLCHAIN=default
-  - PROJECT_DIR=tests/issue/109/unit TOOLCHAIN=default
-  - PROJECT_DIR=tests/autotools-merge-lipo TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_create_args_file TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_create_dependency_entry TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_create_deps_info TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_download_cache_meta_file TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_download_cache_raw_file TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_generate_qt_info TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_get_package_deps TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_get_package_deps_recurse TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_pack_directory TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_register_dependency TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_setup_msvc TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_sleep_before_download TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_unpack_directory TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_init_not_found_counter TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_check_toolchain_definition TOOLCHAIN=default
-  - PROJECT_DIR=tests/hunter_standard_flag TOOLCHAIN=default
-
   - TOOLCHAIN=generate-documentation-test
 
 install:
@@ -79,18 +55,8 @@ install:
   - export ANDROID_NDK_r11c="`pwd`/_ci/android-ndk-r11c"
 
 script:
-  - >
-    if [[ "${TOOLCHAIN}" == "generate-documentation-test" && "`uname`" == "Linux" ]];
-    then
-      cd docs
-      ./jenkins.sh
-    fi
-
-  - >
-    if [[ "${TOOLCHAIN}" != "generate-documentation-test" ]];
-    then
-      python3 ./jenkins.py
-    fi
+  - cd docs
+  - ./jenkins.sh
 
 branches:
   except:

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/cmake/projects/LAPACK/hunter-msvc.cmake b/cmake/projects/LAPACK/hunter-msvc.cmake
@@ -0,0 +1,36 @@
+# Copyright (c) 2017, NeroBurner
+# All rights reserved.
+
+include(hunter_report_broken_package)
+
+#hunter_cacheable(LAPACK) # install is always cacheable
+
+# determine architecture
+include(hunter_check_toolchain_definition)
+hunter_check_toolchain_definition(NAME "_WIN64"    DEFINED _WIN64_defined)
+
+if(_WIN64_defined)
+  hunter_add_version(
+    PACKAGE_NAME
+    LAPACK
+    VERSION
+    "3.7.1"
+    URL
+    https://github.com/hunter-packages/lapack/releases/download/v3.7.1-p0/lapack-prebuilt-3.7.1-msvc-amd64.zip
+    SHA1
+    4a6e51690e36747d51e4334358abac99ca22378c
+  )
+else()
+  hunter_report_broken_package("LAPACK on MSVC is only available on WIN64")
+endif()
+
+# pass cmake arguments
+hunter_cmake_args(
+    LAPACK
+    CMAKE_ARGS
+    HUNTER_INSTALL_LICENSE_FILES=LICENSE
+)
+
+# Pick a download scheme
+hunter_pick_scheme(DEFAULT url_sha1_unpack_install)
+
diff --git a/cmake/projects/LAPACK/hunter-source.cmake b/cmake/projects/LAPACK/hunter-source.cmake
@@ -0,0 +1,27 @@
+# Copyright (c) 2017, NeroBurner
+# All rights reserved.
+
+hunter_cacheable(LAPACK)
+
+# List of versions here...
+hunter_add_version(
+    PACKAGE_NAME
+    LAPACK
+    VERSION
+    "3.7.1"
+    URL
+    https://github.com/hunter-packages/lapack/archive/v3.7.1-p0.tar.gz
+    SHA1
+    82616c0878fbe42f22ece5fadfb38e09456ba5b5
+)
+
+# pass cmake arguments
+hunter_cmake_args(
+    LAPACK
+    CMAKE_ARGS
+    HUNTER_INSTALL_LICENSE_FILES=LICENSE
+)
+
+# Pick a download scheme
+hunter_pick_scheme(DEFAULT url_sha1_cmake)
+
diff --git a/cmake/projects/LAPACK/hunter.cmake b/cmake/projects/LAPACK/hunter.cmake
@@ -10,29 +10,11 @@ include(hunter_download)
 include(hunter_pick_scheme)
 include(hunter_cacheable)
 
-hunter_cacheable(LAPACK)
-
-# List of versions here...
-hunter_add_version(
-    PACKAGE_NAME
-    LAPACK
-    VERSION
-    "3.7.1"
-    URL
-    https://github.com/hunter-packages/lapack/archive/v3.7.1-p0.tar.gz
-    SHA1
-    82616c0878fbe42f22ece5fadfb38e09456ba5b5
-)
-
-# pass cmake arguments
-hunter_cmake_args(
-    LAPACK
-    CMAKE_ARGS
-    HUNTER_INSTALL_LICENSE_FILES=LICENSE
-)
-
-# Pick a download scheme
-hunter_pick_scheme(DEFAULT url_sha1_cmake)
+if(NOT MSVC)
+  include("${CMAKE_CURRENT_LIST_DIR}/hunter-source.cmake")
+else()
+  include("${CMAKE_CURRENT_LIST_DIR}/hunter-msvc.cmake")
+endif()
 
 # Download package.
 # Two versions of library will be build:

diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake
@@ -318,4 +318,4 @@ if(MINGW)
 endif()
 
 hunter_cacheable(OpenSSL)
-hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "13")
+hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "14")
diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in
@@ -89,6 +89,7 @@ if(ANDROID)
   else()
     set(configure_opts "linux-generic32")
   endif()
+  list(APPEND configure_opts "-latomic")
 elseif(RASPBERRY_PI)
   set(configure_opts "linux-generic32")
 endif()

diff --git a/cmake/projects/SDL2/hunter.cmake b/cmake/projects/SDL2/hunter.cmake
@@ -14,7 +14,7 @@ hunter_add_version(
         URL
         "https://github.com/hunter-packages/SDL2/archive/2.0.4-p4.tar.gz"
         SHA1
-        523d8fd427f707541c7e600ad4c37e0e7bdc3662
+        589fcb46963b28e9d968646af54add6f4b19890c
 )
 
 hunter_add_version(