Skip to content
Snippets Groups Projects
Commit a9b1ef04 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Changed CMake setup to use targets instead of variables (#269)

* Moved json to a target

* Moved other dependencies to targets

* Removed cmake Python version requirement
parent 25da26ee
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,8 @@ set(CMAKE_CXX_STANDARD 11) ...@@ -17,7 +17,8 @@ set(CMAKE_CXX_STANDARD 11)
# Third Party Dependencies # Third Party Dependencies
find_package(GSL REQUIRED) find_package(GSL REQUIRED)
find_package(Eigen3 3.3 REQUIRED NO_MODULE) find_package(Eigen3 3.3 REQUIRED NO_MODULE)
find_package(PythonLibs REQUIRED COMPONENTS Development Interpreter Compiler) find_package(Python REQUIRED COMPONENTS Development)
find_package(nlohmann_json REQUIRED)
# Library setup # Library setup
add_library(ale SHARED add_library(ale SHARED
...@@ -25,21 +26,19 @@ add_library(ale SHARED ...@@ -25,21 +26,19 @@ add_library(ale SHARED
set_target_properties(ale PROPERTIES set_target_properties(ale PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION 1) SOVERSION 1)
set(ALE_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/" set(ALE_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/")
"${CMAKE_CURRENT_SOURCE_DIR}/include/json")
target_include_directories(ale target_include_directories(ale
PRIVATE
${GSL_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${PYTHON_INCLUDE_DIR}
PUBLIC PUBLIC
${ALE_INCLUDE_DIRS}) ${ALE_INCLUDE_DIRS})
target_link_libraries(ale target_link_libraries(ale
PRIVATE PRIVATE
${GSL_LIBRARIES} GSL::gsl
${PYTHON_LIBRARY}) GSL::gslcblas
Eigen3::Eigen
Python::Python
nlohmann_json::nlohmann_json)
# Optional build tests # Optional build tests
option (BUILD_TESTS "Build tests" ON) option (BUILD_TESTS "Build tests" ON)
...@@ -52,7 +51,8 @@ if(BUILD_TESTS) ...@@ -52,7 +51,8 @@ if(BUILD_TESTS)
target_link_libraries(ale target_link_libraries(ale
PRIVATE PRIVATE
${GSL_LIBRARIES} GSL::gsl
GSL::gslcblas
${PYTHON_LIBRARY} ${PYTHON_LIBRARY}
PUBLIC PUBLIC
gtest ${CMAKE_THREAD_LIBS_INIT}) gtest ${CMAKE_THREAD_LIBS_INIT})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment