Skip to content

Commit

Permalink
Merge pull request #5 from jdreo/dev
Browse files Browse the repository at this point in the history
feat(cmake): add Paradiseo and clutchlog as submodules
  • Loading branch information
yoann-dufresne authored Sep 9, 2024
2 parents acaeed9 + e55a3d4 commit b0f5592
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "external/googletest"]
path = external/googletest
url = https://github.com/google/googletest.git
[submodule "external/paradiseo"]
path = external/paradiseo
url = https://github.com/nojhan/paradiseo.git
[submodule "external/clutchlog"]
path = external/clutchlog
url = https://github.com/nojhan/clutchlog.git
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(BUILD_DOCS "Enable building of documentation" OFF)
option(BUILD_TESTING "Enable building of tests" OFF)
option(BUILD_FOR_LOCAL "Whether to make the executables dependant on the environment of the building computer (enables CMake's build with RPATH), may be necessary on HPC clusters" OFF)
option(USE_LOCAL_PARADISEO "Use a local version of Paradiseo rather than the one installed on the system" OFF)
option(USE_LOCAL_PARADISEO "Use a local version of Paradiseo rather than the one installed on the system" ON)

# Common
add_compile_options(-Wall -Wextra -pedantic)
Expand All @@ -39,8 +39,8 @@ include_directories(include)

# ParadisEO
if(USE_LOCAL_PARADISEO)
set(PARADISEO_ROOT "PARADISEO_NOT_FOUND" CACHE PATH "Where to find ParadisEO")
set(PARADISEO_BUILD "${PARADISEO_ROOT}/build" CACHE PATH "Build dir of ParadisEO")
set(PARADISEO_ROOT "${PROJECT_SOURCE_DIR}/external/paradiseo" CACHE PATH "Where to find ParadisEO")
set(PARADISEO_BUILD "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "Build dir of ParadisEO")

include_directories(${PARADISEO_ROOT})
include_directories(${PARADISEO_ROOT}/eo/src)
Expand Down Expand Up @@ -71,6 +71,10 @@ add_subdirectory(src)
add_subdirectory(external/googletest)
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})

# ParadisEO
add_subdirectory(external/paradiseo)


# Find all main files in the app directory
file(GLOB APP_SOURCES ${PROJECT_SOURCE_DIR}/app/*.cpp)

Expand Down
1 change: 1 addition & 0 deletions external/clutchlog
Submodule clutchlog added at 7d0252
1 change: 1 addition & 0 deletions external/paradiseo
Submodule paradiseo added at 732fe0

0 comments on commit b0f5592

Please sign in to comment.