Skip to content

Commit

Permalink
wrong patch
Browse files Browse the repository at this point in the history
  • Loading branch information
mhekkel committed Mar 28, 2024
1 parent 6b3766a commit e08323c
Showing 1 changed file with 25 additions and 4 deletions.
29 changes: 25 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ cmake_minimum_required(VERSION 3.10)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

# set the project name
project(mrc VERSION 1.3.11)
project(mrc VERSION 1.3.12)

include(CTest)
include(FetchContent)

set(CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 20)
Expand Down Expand Up @@ -62,8 +61,19 @@ if(WIN32)
message(STATUS "Using COFF spec: ${COFF_SPEC}")
endif()

FetchContent_Declare(libmcfp GIT_REPOSITORY https://github.com/mhekkel/libmcfp GIT_TAG v1.2.4)
find_package(libmcfp 1.2.4 QUIET)

if(NOT libmcfp_FOUND)
include(FetchContent)

FetchContent_Declare(
libmcfp
GIT_REPOSITORY https://github.com/mhekkel/libmcfp
GIT_TAG v1.2.4
)

FetchContent_MakeAvailable(libmcfp)
endif()

include(VersionString)
write_version_header(${PROJECT_SOURCE_DIR}/src/)
Expand All @@ -80,8 +90,19 @@ target_link_libraries(mrc libmcfp::libmcfp)
target_link_libraries(mrc-bootstrap libmcfp::libmcfp)

if(BUILD_TESTING)
FetchContent_Declare(Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_TAG v2.13.9)
find_package(Catch2 3 QUIET)

if(NOT Catch2_FOUND)
Include(FetchContent)

FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v3.5.2 # or a later release
)

FetchContent_MakeAvailable(Catch2)
endif()

file(GLOB UNIT_TEST_RSRC LIST_DIRECTORIES true ${PROJECT_SOURCE_DIR}/rsrc/*)

Expand Down

0 comments on commit e08323c

Please sign in to comment.