From e5e07cc2c4c60e89b51e3d0f7eb6f7458d803124 Mon Sep 17 00:00:00 2001 From: Jakob Maljaars <jakob.maljaars@stcorp.nl> Date: Fri, 11 Dec 2020 11:46:53 +0100 Subject: [PATCH] Test if ci skipped --- CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cc8ba32..6223e2ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,18 @@ endif() include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include/") include_directories("${CMAKE_SOURCE_DIR}/external/eigen/") add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11") -include_directories(${pybind11_INCLUDE_DIR}) +include_directories(${PYBIND11_INCLUDE_DIR}) + +### JUST TESTING SCHAAPCOMMON +# find_path(SCHAAPCOMMON_INCLUDE_DIR NAMES schaapcommon/hello_world.h) +# find_library(SCHAAPCOMMON_LIB schaapcommon) +# include_directories(${SCHAAPCOMMON_INCLUDE_DIR}) + +add_subdirectory("${CMAKE_SOURCE_DIR}/external/schaapcommon") +# message("WHATS THIS") +# message(STATUS ${schaapcommon_INCLUDE_DIR}) +# set(SCHAAPCOMMON_INCLUDE_DIR "/home/maljaars/opt/everybeam/EveryBeam/external/schaapcommon/schaapcommon") +# include_directories(${SCHAAPCOMMON_INCLUDE_DIR}) # Find and include HDF5 find_package(HDF5 COMPONENTS C CXX REQUIRED) @@ -145,7 +156,7 @@ configure_file(${CMAKE_SOURCE_DIR}/CMake/config.h.in ${CMAKE_BINARY_DIR}/config. configure_file(${CMAKE_SOURCE_DIR}/CMake/version.h.in ${CMAKE_BINARY_DIR}/version.h) install(FILES - ${CMAKE_BINARY_DIR}/config.h + ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/version.h DESTINATION "include/${CMAKE_PROJECT_NAME}" ) -- GitLab