Commit 5f3bab41 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Updated cmake stuff (#285) 

* Updated cmake stuff

* More updates
parent 1527c76b

CMakeLists.txt

+21 −29
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
# Specify the required version of CMake.

# Specify the required version of CMake.

# cmake 3.10 required for ctest/gtest integration

# cmake 3.10 required for ctest/gtest integration

cmake_minimum_required(VERSION 3.10)

cmake_minimum_required(VERSION 3.10)

project(ale VERSION 0.3.0 DESCRIPTION "Abstraction Library for Ephemerides ")

project(ale VERSION 0.5.0 DESCRIPTION "Abstraction Library for Ephemerides ")





# include what we need

# include what we need

include(GNUInstallDirs)

include(GNUInstallDirs)
@@ -48,14 +48,6 @@ if(BUILD_TESTS) 
    include(CTest)

    include(CTest)





    find_package (Threads)

    find_package (Threads)



  target_link_libraries(ale

                        PRIVATE

                        GSL::gsl

                        GSL::gslcblas

                        Python::Python

                        PUBLIC

                        gtest ${CMAKE_THREAD_LIBS_INIT})

    enable_testing()

    enable_testing()

    add_subdirectory(tests/ctests)

    add_subdirectory(tests/ctests)

tests/ctests/CMakeLists.txt

+7 −7
Original line number Original line Diff line number Diff line
@@ -6,12 +6,12 @@ file(GLOB test_source "${CMAKE_SOURCE_DIR}/tests/ctests/*.cpp") 
# setup test executable

# setup test executable

add_executable(runAleTests ${test_source})

add_executable(runAleTests ${test_source})

target_link_libraries(runAleTests

target_link_libraries(runAleTests

                      PRIVATE

                      ale

                      ale

                      GSL::gsl

                      GSL::gsl

                      GSL::gslcblas

                      GSL::gslcblas

                      Eigen3::Eigen

                      Eigen3::Eigen

                       ${GTEST_LIBRARIES}

                      gtest

                       ${GTEST_MAIN_LIBRARIES}

                      Threads::Threads)

                       pthread)





gtest_discover_tests(runAleTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/ctests)
 
gtest_discover_tests(runAleTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/ctests)