Skip to content
Snippets Groups Projects
Commit f1a3cfeb authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' into 'main'

Devel

See merge request !12
parents 4074c921 99a25b23
No related branches found
No related tags found
2 merge requests!13Main,!12Devel
Pipeline #12280 passed
......@@ -25,7 +25,7 @@ include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
if(COMPILER_SUPPORTS_CXX11)
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has C++11 support.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_STANDARD 11)
else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
endif()
......@@ -72,9 +72,6 @@ if(csm_FOUND)
endif()
# ============ INCLUDES ============
INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
#headers
SET(HDRS_BASE
include/${PROJECT_NAME}/${PROJECT_NAME}.h)
......@@ -206,6 +203,7 @@ install(
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/conf>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment