Skip to content

Commit

Permalink
Merge pull request #4 from andreacasalino/BetterCmake
Browse files Browse the repository at this point in the history
easier cmake
  • Loading branch information
andreacasalino authored Oct 26, 2022
2 parents 43f226f + a7ff4c0 commit 233fab4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
option(LIB_OPT "Compile shared libraries (ON) or static (OFF)" OFF)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

# set macro-directory and find scripts
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")

# include cmake custom functions
set(WITH_SOURCE_TREE ON)
include(GroupSources)
include(AutoCollect)
include(MakeLibrary)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GroupSources.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AutoCollect.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/MakeLibrary.cmake)

option(Fast-Quick-Hull-THREAD_POOL_OPT "thread pool enabled (ON) or disabled (OFF)" ON)
project(Fast-Quick-Hull-Prj)
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include(FetchContent)
FetchContent_Declare(
hull
GIT_REPOSITORY https://github.com/andreacasalino/Hull.git
GIT_TAG 506a77bd926c0f448f070f2cfa58a0812edefeb3
GIT_TAG 90f09a1baefcfe02ef8d5a3cb44a42536efe5060
)
FetchContent_MakeAvailable(hull)

Expand Down

0 comments on commit 233fab4

Please sign in to comment.