Commit defa023d authored by Thibault Hallouin's avatar Thibault Hallouin
Browse files

tidy up CMake files

1 merge request!2refactor structure and proper cmake instructions
Pipeline #42140 passed with stage
in 1 minute and 59 seconds
Showing with 34 additions and 8 deletions
+34 -8
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(EvalHyd LANGUAGES CXX VERSION 0.0.1 DESCRIPTION "Utility to evaluate streamflow predictions")
project(
EvalHyd
LANGUAGES CXX
VERSION 0.0.1
DESCRIPTION "Utility to evaluate streamflow predictions"
)
# ------------------------------------------------------------------------------
# dependencies
# ------------------------------------------------------------------------------
find_package(xtensor REQUIRED)
message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor")
# ------------------------------------------------------------------------------
# build
# ------------------------------------------------------------------------------
# define evalhyd library # define evalhyd library
add_library( add_library(
...@@ -22,8 +39,6 @@ target_include_directories( ...@@ -22,8 +39,6 @@ target_include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
find_package(xtensor REQUIRED)
target_link_libraries( target_link_libraries(
evalhyd evalhyd
PUBLIC PUBLIC
...@@ -36,9 +51,15 @@ target_compile_features( ...@@ -36,9 +51,15 @@ target_compile_features(
cxx_std_14 cxx_std_14
) )
# testing # test suite
OPTION(EVALHYD_BUILD_TEST "configure and compile tests" ON) OPTION(EVALHYD_BUILD_TEST "configure and compile tests" ON)
if(EVALHYD_BUILD_TEST) if(EVALHYD_BUILD_TEST)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()
# ------------------------------------------------------------------------------
# installation
# ------------------------------------------------------------------------------
# TODO
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
# TEST SUITE ------------------------------------------------------------------- # ------------------------------------------------------------------------------
# dependencies
# ------------------------------------------------------------------------------
find_package(GTest REQUIRED)
# ------------------------------------------------------------------------------
# build
# ------------------------------------------------------------------------------
add_executable( add_executable(
evalhyd_tests evalhyd_tests
test_determinist.cpp test_determinist.cpp
...@@ -17,11 +24,9 @@ target_include_directories( ...@@ -17,11 +24,9 @@ target_include_directories(
target_compile_definitions( target_compile_definitions(
evalhyd_tests evalhyd_tests
PRIVATE PRIVATE
EVALHYD_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" EVALHYD_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data"
) )
find_package(GTest REQUIRED)
target_link_libraries( target_link_libraries(
evalhyd_tests evalhyd_tests
PRIVATE PRIVATE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment