GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 18:20:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update CATCH2 to 2.4.2 from 2.0.1.

Browse Source
This commit is contained in:
Joseph Lenox 2018-11-25 10:36:22 -06:00 committed by Joseph Lenox
parent 8fd4c85ba4
commit 181ef8e221
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/CMakeLists.txt
View File

@ -418,23 +418,23 @@ IF(wxWidgets_FOUND AND OPENGL_FOUND AND Enable_GUI)
include (ExternalProject) include (ExternalProject)
if(IS_TRAVIS_BUILD) # on travis, use git for fetching instead of wget if(IS_TRAVIS_BUILD) # on travis, use git for fetching instead of wget
set(FETCH_EXTERNAL_CATCH set(FETCH_EXTERNAL_CATCH
GIT_REPOSITORY https://github.com/philsquared/Catch.git GIT_REPOSITORY https://github.com/catchorg/Catch.git
GIT_TAG 19ab2117c5bac2f376f8da4a4b25e183137bcec0) GIT_TAG 03d122a35c3f5c398c43095a87bc82ed44642516)
elseif(WIN32) elseif(WIN32)
set(FETCH_EXTERNAL_CATCH set(FETCH_EXTERNAL_CATCH
URL https://github.com/catchorg/Catch2/archive/v2.0.1.zip URL https://github.com/catchorg/Catch2/archive/v2.4.2.zip
URL_HASH MD5=1abca1b324b99b1631e999119b172620) URL_HASH MD5=6a2ffb9c69d368ebc1ad13146c5a5e1e)
else() else()
set(FETCH_EXTERNAL_CATCH set(FETCH_EXTERNAL_CATCH
URL https://github.com/catchorg/Catch2/archive/v2.0.1.tar.gz URL https://github.com/catchorg/Catch2/archive/v2.4.2.tar.gz
URL_HASH MD5=2080f4696579351d9323b3b5a8c3c71b) URL_HASH MD5=26927b878b1f42633f15a9ef1c4bd8e7)
endif() endif()
ExternalProject_Add(Catch-External ExternalProject_Add(Catch-External
PREFIX ${CMAKE_BINARY_DIR}/external/Catch PREFIX ${CMAKE_BINARY_DIR}/external/Catch
${FETCH_EXTERNAL_CATCH} ${FETCH_EXTERNAL_CATCH}
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/external/Catch/src/Catch-External/single_include/catch.hpp INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/external/Catch/src/Catch-External/single_include/catch2/catch.hpp
${CMAKE_BINARY_DIR}/external/Catch/include/catch.hpp ${CMAKE_BINARY_DIR}/external/Catch/include/catch.hpp
) )
add_library(Catch INTERFACE) add_library(Catch INTERFACE)
@ -500,23 +500,23 @@ if (SLIC3R_BUILD_TESTS)
include (ExternalProject) include (ExternalProject)
if(IS_TRAVIS_BUILD) # on travis, use git for fetching instead of wget if(IS_TRAVIS_BUILD) # on travis, use git for fetching instead of wget
set(FETCH_EXTERNAL_CATCH set(FETCH_EXTERNAL_CATCH
GIT_REPOSITORY https://github.com/philsquared/Catch.git GIT_REPOSITORY https://github.com/catchorg/Catch.git
GIT_TAG 19ab2117c5bac2f376f8da4a4b25e183137bcec0) GIT_TAG 03d122a35c3f5c398c43095a87bc82ed44642516)
elseif(WIN32) elseif(WIN32)
set(FETCH_EXTERNAL_CATCH set(FETCH_EXTERNAL_CATCH
URL https://github.com/catchorg/Catch2/archive/v2.0.1.zip URL https://github.com/catchorg/Catch2/archive/v2.4.2.zip
URL_HASH MD5=1abca1b324b99b1631e999119b172620) URL_HASH MD5=6a2ffb9c69d368ebc1ad13146c5a5e1e)
else() else()
set(FETCH_EXTERNAL_CATCH set(FETCH_EXTERNAL_CATCH
URL https://github.com/catchorg/Catch2/archive/v2.0.1.tar.gz URL https://github.com/catchorg/Catch2/archive/v2.4.2.tar.gz
URL_HASH MD5=2080f4696579351d9323b3b5a8c3c71b) URL_HASH MD5=26927b878b1f42633f15a9ef1c4bd8e7)
endif() endif()
ExternalProject_Add(Catch-External ExternalProject_Add(Catch-External
PREFIX ${CMAKE_BINARY_DIR}/external/Catch PREFIX ${CMAKE_BINARY_DIR}/external/Catch
${FETCH_EXTERNAL_CATCH} ${FETCH_EXTERNAL_CATCH}
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/external/Catch/src/Catch-External/single_include/catch.hpp INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/external/Catch/src/Catch-External/single_include/catch2/catch.hpp
${CMAKE_BINARY_DIR}/external/Catch/include/catch.hpp ${CMAKE_BINARY_DIR}/external/Catch/include/catch.hpp
) )
add_library(Catch INTERFACE) add_library(Catch INTERFACE)