diff --git a/CMakeLists.txt b/CMakeLists.txt index d6282368..66d87079 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,10 +336,11 @@ target_include_directories(camplib PRIVATE ${KLU_INCLUDE_DIRS} ${SUNDIALS_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include + ${CMAKE_SOURCE_DIR}/gitmodules/camp/include ) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include/camp) execute_process( - COMMAND ${PYTHON_EXECUTABLE} "-c" "import sys; print(''.join([line.replace(')','').replace('set(','#define ').replace('PACKAGE_', 'CAMP_') for line in sys.stdin if line.startswith('set(PACKAGE_VERSION')]))" + COMMAND ${PYTHON_EXECUTABLE} "-c" "import sys; print(''.join([line.replace(')','').replace('set(','#define ').replace('PROJECT_', 'CAMP_') for line in sys.stdin if line.startswith('set(PROJECT_VERSION')]))" INPUT_FILE ${CMAKE_SOURCE_DIR}/gitmodules/camp/CMakeLists.txt OUTPUT_FILE ${CMAKE_BINARY_DIR}/include/camp/version.h ) diff --git a/gitmodules/camp b/gitmodules/camp index 978b01a6..b2794ec5 160000 --- a/gitmodules/camp +++ b/gitmodules/camp @@ -1 +1 @@ -Subproject commit 978b01a65bbf74ebfa188ed580244f136a015a56 +Subproject commit b2794ec5d79d4acfdb5f64ea291911203606ebac diff --git a/pyproject.toml b/pyproject.toml index 49ee77f3..3c662866 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ include = [ "gitmodules/camp/COPYING", "gitmodules/camp/CMakeLists.txt", "gitmodules/camp/src", + "gitmodules/camp/include/camp", "gitmodules/json-fortran/LICENSE", "gitmodules/json-fortran/src", "gitmodules/SuiteSparse/LICENSE.txt",