with tests

lobis · Nov 29, 2023 · fd10866 · fd10866
1 parent 7b67463
commit fd10866
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -72,7 +72,7 @@ jobs:
           cd application
           mkdir -p build
           cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=${CONDA_PREFIX}
+          cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_TESTS=ON -DCMAKE_PREFIX_PATH=${CONDA_PREFIX}
           make
           cd tests
           ctest

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
@@ -47,11 +47,8 @@ file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
 
-target_include_directories(
-    ${PROJECT_NAME}
-    PUBLIC ${PROJECT_SOURCE_DIR}/include
-    PRIVATE ${Geant4_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
-            ${PyBind11_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include
+                                                  ${Geant4_INCLUDE_DIRS})
 
 target_link_libraries(
     ${PROJECT_NAME} PUBLIC ${Geant4_LIBRARIES} awkward::layout-builder
@@ -64,7 +61,8 @@ file(GLOB_RECURSE PYTHON_SOURCES CONFIGURE_DEPENDS
 pybind11_add_module(${PYTHON_MODULE_NAME} ${PYTHON_SOURCES})
 target_link_libraries(${PYTHON_MODULE_NAME} PUBLIC ${PROJECT_NAME})
 
-if (CMAKE_BUILD_TYPE MATCHES Debug)
+# -DWITH_TESTS=ON
+if (WITH_TESTS)
     message(STATUS "Building tests")
     add_subdirectory(tests)
 endif ()
diff --git a/application/src/python/module.cpp b/application/src/python/module.cpp
@@ -1,7 +1,11 @@
 
 #include "geant4/Application.h"
 
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
 #include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 using namespace geant4;
 namespace py = pybind11;

diff --git a/application/tests/CMakeLists.txt b/application/tests/CMakeLists.txt
@@ -20,7 +20,8 @@ add_executable(${TEST_EXECUTABLE_NAME})
 target_sources(${TEST_EXECUTABLE_NAME} PRIVATE ${TEST_SOURCES})
 target_include_directories(${TEST_EXECUTABLE_NAME}
                            PRIVATE ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(${TEST_EXECUTABLE_NAME} ${PROJECT_NAME} GTest::gtest_main)
+target_link_libraries(${TEST_EXECUTABLE_NAME} ${PROJECT_NAME} GTest::gtest_main
+                      pybind11::embed)
 
 include(GoogleTest)
 gtest_discover_tests(${TEST_EXECUTABLE_NAME})