diff --git a/cmake/podioCPack.cmake b/cmake/podioCPack.cmake index 919acac7a..e20828ce4 100644 --- a/cmake/podioCPack.cmake +++ b/cmake/podioCPack.cmake @@ -15,9 +15,9 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "valentin.volkl@cern.ch") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "hep-root, python-yaml") -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/cmake/podioCreateConfig.cmake b/cmake/podioCreateConfig.cmake index 74d65e9a0..0d73cd441 100644 --- a/cmake/podioCreateConfig.cmake +++ b/cmake/podioCreateConfig.cmake @@ -19,7 +19,7 @@ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/podioConfig.cmake.in install(FILES ${CMAKE_CURRENT_BINARY_DIR}/podioConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/podioConfigVersion.cmake - ${CMAKE_SOURCE_DIR}/cmake/podioMacros.cmake + ${PROJECT_SOURCE_DIR}/cmake/podioMacros.cmake DESTINATION ${CMAKE_INSTALL_CMAKEDIR}/${PROJECT_NAME} ) install(EXPORT podioTargets DESTINATION ${CMAKE_INSTALL_CMAKEDIR}/${PROJECT_NAME} diff --git a/cmake/podioTest.cmake b/cmake/podioTest.cmake index f668a8d7b..0515a45fa 100644 --- a/cmake/podioTest.cmake +++ b/cmake/podioTest.cmake @@ -6,13 +6,13 @@ function(PODIO_SET_TEST_ENV test) set_property(TEST ${test} PROPERTY ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests:${CMAKE_BINARY_DIR}/src:$:$<$:$>:$ENV{LD_LIBRARY_PATH} - PYTHONPATH=${CMAKE_SOURCE_DIR}/python:$ENV{PYTHONPATH} + PYTHONPATH=${PROJECT_SOURCE_DIR}/python:$ENV{PYTHONPATH} PODIO_SIOBLOCK_PATH=${CMAKE_BINARY_DIR}/tests - ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tests/datamodel:${CMAKE_SOURCE_DIR}/include + ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tests/datamodel:${PROJECT_SOURCE_DIR}/include SKIP_SIO_TESTS=$> IO_HANDLERS=${IO_HANDLERS} PODIO_USE_CLANG_FORMAT=${PODIO_USE_CLANG_FORMAT} - PODIO_BASE=${CMAKE_SOURCE_DIR} + PODIO_BASE=${PROJECT_SOURCE_DIR} ENABLE_SIO=${ENABLE_SIO} ) endfunction() @@ -35,7 +35,7 @@ macro(PODIO_DOWNLOAD_LEGACY_INPUTS legacy_versions) if (NOT DEFINED CACHE{PODIO_TEST_INPUT_DATA_DIR} OR NOT EXISTS ${PODIO_TEST_INPUT_DATA_DIR}/v00-16-05/example_frame.root) message(STATUS "Getting test input files") execute_process( - COMMAND bash ${CMAKE_SOURCE_DIR}/tests/scripts/get_test_inputs.sh ${legacy_versions} + COMMAND bash ${PROJECT_SOURCE_DIR}/tests/scripts/get_test_inputs.sh ${legacy_versions} OUTPUT_VARIABLE podio_test_input_data_dir RESULT_VARIABLE test_inputs_available ) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 2de868d7e..b0f601f8f 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -144,7 +144,7 @@ FULL_PATH_NAMES = YES # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@ @CMAKE_BINARY_DIR@ +STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@ @CMAKE_BINARY_DIR@ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which @@ -743,7 +743,7 @@ WARN_LOGFILE = @CMAKE_BINARY_DIR@/doxygen-warnings.log # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = @CMAKE_SOURCE_DIR@ +INPUT = @PROJECT_SOURCE_DIR@ INPUT += @CMAKE_BINARY_DIR@/include INPUT += @CMAKE_CURRENT_BINARY_DIR@ @@ -818,7 +818,7 @@ EXCLUDE_SYMBOLS = # that contain example code fragments that are included (see the \include # command). -EXAMPLE_PATH = @CMAKE_SOURCE_DIR@ +EXAMPLE_PATH = @PROJECT_SOURCE_DIR@ # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 9a7e39bd7..eea3a105a 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -28,7 +28,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/templates DESTINATION ${podio_PYTHON_INSTALLDIR}) IF (BUILD_TESTING) - add_test( NAME pyunittest COMMAND python3 -m unittest discover -s ${CMAKE_SOURCE_DIR}/python/podio) + add_test( NAME pyunittest COMMAND python3 -m unittest discover -s ${PROJECT_SOURCE_DIR}/python/podio) PODIO_SET_TEST_ENV(pyunittest) set_property(TEST pyunittest PROPERTY DEPENDS write write_frame_root) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index daea12e5f..8cdd0d813 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,16 +61,16 @@ SET(core_sources ) SET(core_headers - ${CMAKE_SOURCE_DIR}/include/podio/CollectionBase.h - ${CMAKE_SOURCE_DIR}/include/podio/CollectionIDTable.h - ${CMAKE_SOURCE_DIR}/include/podio/EventStore.h - ${CMAKE_SOURCE_DIR}/include/podio/ICollectionProvider.h - ${CMAKE_SOURCE_DIR}/include/podio/IReader.h - ${CMAKE_SOURCE_DIR}/include/podio/ObjectID.h - ${CMAKE_SOURCE_DIR}/include/podio/UserDataCollection.h - ${CMAKE_SOURCE_DIR}/include/podio/podioVersion.h - ${CMAKE_SOURCE_DIR}/include/podio/DatamodelRegistry.h - ${CMAKE_SOURCE_DIR}/include/podio/utilities/DatamodelRegistryIOHelpers.h + ${PROJECT_SOURCE_DIR}/include/podio/CollectionBase.h + ${PROJECT_SOURCE_DIR}/include/podio/CollectionIDTable.h + ${PROJECT_SOURCE_DIR}/include/podio/EventStore.h + ${PROJECT_SOURCE_DIR}/include/podio/ICollectionProvider.h + ${PROJECT_SOURCE_DIR}/include/podio/IReader.h + ${PROJECT_SOURCE_DIR}/include/podio/ObjectID.h + ${PROJECT_SOURCE_DIR}/include/podio/UserDataCollection.h + ${PROJECT_SOURCE_DIR}/include/podio/podioVersion.h + ${PROJECT_SOURCE_DIR}/include/podio/DatamodelRegistry.h + ${PROJECT_SOURCE_DIR}/include/podio/utilities/DatamodelRegistryIOHelpers.h ) PODIO_ADD_LIB_AND_DICT(podio "${core_headers}" "${core_sources}" selection.xml) @@ -94,14 +94,14 @@ if(ENABLE_RNTUPLE) endif() SET(root_headers - ${CMAKE_SOURCE_DIR}/include/podio/ROOTFrameReader.h - ${CMAKE_SOURCE_DIR}/include/podio/ROOTLegacyReader.h - ${CMAKE_SOURCE_DIR}/include/podio/ROOTFrameWriter.h + ${PROJECT_SOURCE_DIR}/include/podio/ROOTFrameReader.h + ${PROJECT_SOURCE_DIR}/include/podio/ROOTLegacyReader.h + ${PROJECT_SOURCE_DIR}/include/podio/ROOTFrameWriter.h ) if(ENABLE_RNTUPLE) list(APPEND root_headers - ${CMAKE_SOURCE_DIR}/include/podio/ROOTNTupleReader.h - ${CMAKE_SOURCE_DIR}/include/podio/ROOTNTupleWriter.h + ${PROJECT_SOURCE_DIR}/include/podio/ROOTNTupleReader.h + ${PROJECT_SOURCE_DIR}/include/podio/ROOTNTupleWriter.h ) endif() @@ -119,7 +119,7 @@ SET(python_sources ) SET(python_headers - ${CMAKE_SOURCE_DIR}/include/podio/PythonEventStore.h + ${PROJECT_SOURCE_DIR}/include/podio/PythonEventStore.h ) PODIO_ADD_LIB_AND_DICT(podioPythonStore "${python_headers}" "${python_sources}" python_selection.xml) target_link_libraries(podioPythonStore PUBLIC podio::podio) @@ -140,9 +140,9 @@ if(ENABLE_SIO) ) SET(sio_headers - ${CMAKE_SOURCE_DIR}/include/podio/SIOFrameReader.h - ${CMAKE_SOURCE_DIR}/include/podio/SIOLegacyReader.h - ${CMAKE_SOURCE_DIR}/include/podio/SIOFrameWriter.h + ${PROJECT_SOURCE_DIR}/include/podio/SIOFrameReader.h + ${PROJECT_SOURCE_DIR}/include/podio/SIOLegacyReader.h + ${PROJECT_SOURCE_DIR}/include/podio/SIOFrameWriter.h ) PODIO_ADD_LIB_AND_DICT(podioSioIO "${sio_headers}" "${sio_sources}" sio_selection.xml) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6591196c8..60b2bdd17 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,7 +6,7 @@ foreach( _conf ${CMAKE_CONFIGURATION_TYPES} ) endforeach() # Set the podio_PYTHON_DIR manually here because the macros below expect it -SET(podio_PYTHON_DIR ${CMAKE_SOURCE_DIR}/python) +SET(podio_PYTHON_DIR ${PROJECT_SOURCE_DIR}/python) PODIO_GENERATE_DATAMODEL(datamodel datalayout.yaml headers sources IO_BACKEND_HANDLERS ${PODIO_IO_HANDLERS} diff --git a/tests/dumpmodel/CMakeLists.txt b/tests/dumpmodel/CMakeLists.txt index ccab43bc6..d796325cb 100644 --- a/tests/dumpmodel/CMakeLists.txt +++ b/tests/dumpmodel/CMakeLists.txt @@ -1,19 +1,19 @@ # Add tests for storing and retrieving the EDM definitions into the produced # files -add_test(NAME datamodel_def_store_roundtrip_root COMMAND ${CMAKE_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh +add_test(NAME datamodel_def_store_roundtrip_root COMMAND ${PROJECT_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh ${CMAKE_BINARY_DIR}/tests/root_io/example_frame.root datamodel - ${CMAKE_SOURCE_DIR}/tests + ${PROJECT_SOURCE_DIR}/tests ) PODIO_SET_TEST_ENV(datamodel_def_store_roundtrip_root) # The extension model needs to know about the upstream model for generation add_test(NAME datamodel_def_store_roundtrip_root_extension COMMAND - ${CMAKE_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh + ${PROJECT_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh ${CMAKE_BINARY_DIR}/tests/root_io/example_frame.root extension_model - ${CMAKE_SOURCE_DIR}/tests/extension_model - --upstream-edm=datamodel:${CMAKE_SOURCE_DIR}/tests/datalayout.yaml + ${PROJECT_SOURCE_DIR}/tests/extension_model + --upstream-edm=datamodel:${PROJECT_SOURCE_DIR}/tests/datalayout.yaml ) PODIO_SET_TEST_ENV(datamodel_def_store_roundtrip_root_extension) @@ -27,18 +27,18 @@ set_tests_properties( set(sio_roundtrip_tests "") if (ENABLE_SIO) - add_test(NAME datamodel_def_store_roundtrip_sio COMMAND ${CMAKE_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh + add_test(NAME datamodel_def_store_roundtrip_sio COMMAND ${PROJECT_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh ${CMAKE_BINARY_DIR}/tests/sio_io/example_frame.sio datamodel - ${CMAKE_SOURCE_DIR}/tests + ${PROJECT_SOURCE_DIR}/tests ) PODIO_SET_TEST_ENV(datamodel_def_store_roundtrip_sio) # The extension model needs to know about the upstream model for generation - add_test(NAME datamodel_def_store_roundtrip_sio_extension COMMAND ${CMAKE_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh + add_test(NAME datamodel_def_store_roundtrip_sio_extension COMMAND ${PROJECT_SOURCE_DIR}/tests/scripts/dumpModelRoundTrip.sh ${CMAKE_BINARY_DIR}/tests/sio_io/example_frame.sio extension_model - ${CMAKE_SOURCE_DIR}/tests/extension_model - --upstream-edm=datamodel:${CMAKE_SOURCE_DIR}/tests/datalayout.yaml + ${PROJECT_SOURCE_DIR}/tests/extension_model + --upstream-edm=datamodel:${PROJECT_SOURCE_DIR}/tests/datalayout.yaml ) PODIO_SET_TEST_ENV(datamodel_def_store_roundtrip_sio_extension)