diff --git a/CMakeLists.txt b/CMakeLists.txt index 0432aaf..4643462 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES) endif() #--- add version files --------------------------------------------------------- -configure_file(${CMAKE_SOURCE_DIR}/k4SimDelphesVersion.h +configure_file(${PROJECT_SOURCE_DIR}/k4SimDelphesVersion.h ${CMAKE_BINARY_DIR}/k4SimDelphesVersion.h ) install(FILES ${CMAKE_BINARY_DIR}/k4SimDelphesVersion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/k4SimDelphes ) diff --git a/cmake/k4SimDelphesCPack.cmake b/cmake/k4SimDelphesCPack.cmake index 588b25e..da79638 100644 --- a/cmake/k4SimDelphesCPack.cmake +++ b/cmake/k4SimDelphesCPack.cmake @@ -16,9 +16,9 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "valentin.volkl@cern.ch") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "delphes, edm4hep") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") -set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md") +set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") +set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md") #--- source package settings --------------------------------------------------- set(CPACK_SOURCE_IGNORE_FILES diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f22fda8..6aec16a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -7,8 +7,8 @@ add_executable(compare_delphes_converter_outputs src/compare_delphes_converter_o target_include_directories(compare_delphes_converter_outputs PRIVATE ${DELPHES_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/converter/src #for delphesHelpers - ${CMAKE_SOURCE_DIR}/converter/include + ${PROJECT_SOURCE_DIR}/converter/src #for delphesHelpers + ${PROJECT_SOURCE_DIR}/converter/include ) target_link_libraries(compare_delphes_converter_outputs PRIVATE EDM4HEP::edm4hep ${DELPHES_LIBRARY} podio::podioRootIO ROOT::Physics) @@ -26,7 +26,7 @@ function(ADD_COMPARISON_TEST name converter) endif() add_test(NAME ${name} - COMMAND bash -x ${CMAKE_SOURCE_DIR}/tests/testDriver.sh ${converter} ${ARGN}) + COMMAND bash -x ${PROJECT_SOURCE_DIR}/tests/testDriver.sh ${converter} ${ARGN}) set_property(TEST ${name} PROPERTY ENVIRONMENT LD_LIBRARY_PATH=$:$:$:$:$ENV{LD_LIBRARY_PATH} @@ -35,13 +35,13 @@ function(ADD_COMPARISON_TEST name converter) ) endfunction() -set(OUTPUT_CONFIG ${CMAKE_SOURCE_DIR}/examples/edm4hep_output_config.tcl) +set(OUTPUT_CONFIG ${PROJECT_SOURCE_DIR}/examples/edm4hep_output_config.tcl) # Get the delphes card from the Delphes installation find_file(DELPHES_CARD delphes_card_IDEA.tcl PATHS ${DELPHES_CARDS_DIR}) if(DELPHES_CARD) if(BUILD_PYTHIA_READER) - ADD_COMPARISON_TEST(PythiaConverter_ee_Z_bbbar DelphesPythia8_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} pythia_converter_output_ee_Z_bbbar.root ${CMAKE_SOURCE_DIR}/examples/data/ee_Z_bbbar_ecm91GeV.cmd) + ADD_COMPARISON_TEST(PythiaConverter_ee_Z_bbbar DelphesPythia8_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} pythia_converter_output_ee_Z_bbbar.root ${PROJECT_SOURCE_DIR}/examples/data/ee_Z_bbbar_ecm91GeV.cmd) endif() else() message(WARNING "Cannot find IDEA delphes card from the delphes installation. Cannot use it for testing") @@ -51,7 +51,7 @@ endif() find_file(DELPHES_CARD delphes_card_IDEA.tcl PATHS ${DELPHES_CARDS_DIR}) if(DELPHES_CARD) if(BUILD_PYTHIA_READER) - ADD_COMPARISON_TEST(PythiaResonanceDecayFilter_pp_hhbbyy DelphesPythia8_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} pythia_resonance_decay_filter_pp_hhbbyy_output.root ${CMAKE_SOURCE_DIR}/examples/data/tester_pwp8_pp_hh_5f_hhbbyy.cmd --no-delphes) + ADD_COMPARISON_TEST(PythiaResonanceDecayFilter_pp_hhbbyy DelphesPythia8_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} pythia_resonance_decay_filter_pp_hhbbyy_output.root ${PROJECT_SOURCE_DIR}/examples/data/tester_pwp8_pp_hh_5f_hhbbyy.cmd --no-delphes) endif() else() message(WARNING "Cannot find IDEA delphes card from the delphes installation. Cannot use it for testing")