FIX: change zlib/1.2.11 reference

lifeng98ol · Mar 27, 2021 · c43c062 · c43c062
1 parent ef5fd2a
commit c43c062
Show file tree

Hide file tree

Showing 6 changed files with 919 additions and 18 deletions.
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
@@ -26,7 +26,7 @@ RUN apt-get install -y -qq --no-install-recommends python3 python3-pip python3-s
 RUN pip3 install conan \
     && conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan \
     && conan remote add conan-community https://api.bintray.com/conan/conan-community/conan \
-    && conan remote add wiznoteplus https://api.bintray.com/conan/altairwei/conan \
+    && conan remote add wiznoteplus https://wiznoteplus.jfrog.io/artifactory/api/conan/wiznoteplus \
     && conan profile new default --detect \
     && conan profile update settings.compiler.libcxx=libstdc++11 default
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           pip install conan
           conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
           conan remote add conan-community https://api.bintray.com/conan/conan-community/conan
-          conan remote add wiznoteplus https://api.bintray.com/conan/altairwei/conan
+          conan remote add wiznoteplus https://wiznoteplus.jfrog.io/artifactory/api/conan/wiznoteplus
           conan profile new default --detect
           conan profile update settings.compiler.libcxx=libstdc++11 default
       - name: Build project
@@ -93,7 +93,7 @@ jobs:
           python -m pip install conan
           conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
           conan remote add conan-community https://api.bintray.com/conan/conan-community/conan
-          conan remote add wiznoteplus https://api.bintray.com/conan/altairwei/conan
+          conan remote add wiznoteplus https://wiznoteplus.jfrog.io/artifactory/api/conan/wiznoteplus
           conan profile new default --detect
       - name: Cache Qt
         id: cache-qt
@@ -146,7 +146,7 @@ jobs:
           python -m pip install conan
           conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
           conan remote add conan-community https://api.bintray.com/conan/conan-community/conan
-          conan remote add wiznoteplus https://api.bintray.com/conan/altairwei/conan
+          conan remote add wiznoteplus https://wiznoteplus.jfrog.io/artifactory/api/conan/wiznoteplus
           conan profile new default --detect
       - name: Cache Qt
         id: cache-qt

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,12 +75,12 @@ endif(APPLE)
 message("\nStart generate 3rdparty dependencies as ${CMAKE_BUILD_TYPE}:\n")
 
 if(NOT CONAN_INSTALL_MANUALLY)
-    if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
-        message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
-        file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake"
-                        "${CMAKE_BINARY_DIR}/conan.cmake")
-    endif()
-    include(${CMAKE_BINARY_DIR}/conan.cmake)
+    # if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
+    #     message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
+    #     file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake"
+    #                     "${CMAKE_BINARY_DIR}/conan.cmake")
+    # endif()
+    include(conan)
     conan_check(REQUIRED)
     conan_cmake_run(
         CONANFILE conanfile.py
@@ -99,7 +99,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH})
 # setup 3rd-party package
 find_package(cryptopp REQUIRED)
 find_package(quazip REQUIRED)
-find_package(zlib REQUIRED)
+find_package(ZLIB REQUIRED)
 find_package(Gumbo REQUIRED)
 find_package(OpenSSL)