Merge branch 'master' into fix-format

key4hep · Jul 19, 2023 · 3090ea0 · 3090ea0
2 parents c704d6c + 6e58eb4
commit 3090ea0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/k4MarlinWrapper/CMakeLists.txt b/k4MarlinWrapper/CMakeLists.txt
@@ -33,7 +33,7 @@ gaudi_add_module(k4MarlinWrapperPlugins
 )
 
 target_include_directories(k4MarlinWrapperPlugins PUBLIC
-  ${CMAKE_SOURCE_DIR}/k4MarlinWrapper
+  ${PROJECT_SOURCE_DIR}/k4MarlinWrapper
   ${LCIO_INCLUDE_DIRS}
   ${Marlin_INCLUDE_DIRS}
 )
@@ -50,7 +50,7 @@ gaudi_add_module(MarlinWrapper
 )
 
 target_include_directories(MarlinWrapper PUBLIC
-  ${CMAKE_SOURCE_DIR}/k4MarlinWrapper
+  ${PROJECT_SOURCE_DIR}/k4MarlinWrapper
   ${Marlin_INCLUDE_DIRS}
   ${LCIO_INCLUDE_DIRS}
 )
@@ -69,7 +69,7 @@ gaudi_add_module(EDM4hep2Lcio
 )
 
 target_include_directories(EDM4hep2Lcio PUBLIC
-  ${CMAKE_SOURCE_DIR}/k4MarlinWrapper
+  ${PROJECT_SOURCE_DIR}/k4MarlinWrapper
   ${LCIO_INCLUDE_DIRS}
   ${Marlin_INCLUDE_DIRS}
 )
@@ -86,15 +86,15 @@ gaudi_add_module(Lcio2EDM4hep
 )
 
 target_include_directories(Lcio2EDM4hep PUBLIC
-  ${CMAKE_SOURCE_DIR}/k4MarlinWrapper
+  ${PROJECT_SOURCE_DIR}/k4MarlinWrapper
   ${LCIO_INCLUDE_DIRS}
 )
 
 # Copy python parsing file to genConfDir in Gaudi
 add_custom_command(
         TARGET MarlinWrapper POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy
-                ${CMAKE_SOURCE_DIR}/k4MarlinWrapper/python/k4MarlinWrapper/parseConstants.py
+                ${PROJECT_SOURCE_DIR}/k4MarlinWrapper/python/k4MarlinWrapper/parseConstants.py
                 ${CMAKE_CURRENT_BINARY_DIR}/genConfDir/k4MarlinWrapper/parseConstants.py)
 
 # Install the example options files to share to make them easily accessible

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,7 +13,7 @@ gaudi_add_module(TestE4H2L
 
 target_include_directories(TestE4H2L PUBLIC
   src
-  ${CMAKE_SOURCE_DIR}/k4MarlinWrapper
+  ${PROJECT_SOURCE_DIR}/k4MarlinWrapper
   k4FWCore::k4FWCore
   EDM4HEP::edm4hep
   ${LCIO_INCLUDE_DIRS}