Skip to content

Commit

Permalink
Rename CMAKE_{SOURCE,BIN}_DIR to PROJECT_{SOURCE,BIN}_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell committed Jul 13, 2023
1 parent 430f6e4 commit 7bf1f47
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
6 changes: 3 additions & 3 deletions cmake/k4SimDelphesCPack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "[email protected]")
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
Expand Down
12 changes: 6 additions & 6 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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=$<TARGET_FILE_DIR:DelphesEDM4HepConverter>:$<TARGET_FILE_DIR:EDM4HEP::edm4hepDict>:$<TARGET_FILE_DIR:podio::podioDict>:$<TARGET_FILE_DIR:ROOT::RIO>:$ENV{LD_LIBRARY_PATH}
Expand All @@ -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")
Expand All @@ -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")
Expand Down

0 comments on commit 7bf1f47

Please sign in to comment.