Skip to content

feat: use CMake's GNUInstallDir #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdconinc wants to merge 6 commits into
base: master
Choose a base branch
from
Open

feat: use CMake's GNUInstallDir #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11b8d03
feat: use CMake's GnuInstallDir
wdconinc Sep 19, 2026
6d2b413
fix: use correct include directive for GNUInstallDirs
wdconinc Sep 19, 2026
0bdfcbd
fix: include GNUInstallDirs in modules installed for users
wdconinc Sep 19, 2026
11af52f
fix: INSTALL_RPATH also needs to use GNU install dirs
wdconinc Sep 20, 2026
43b80f4
fix: replace JANA_INSTALL_DIR/lib with CMAKE_INSTALL_LIBDIR etc.
wdconinc Sep 20, 2026
b84db9a
fix: include GNUInstallDirs in each generated CMakeLists for standalo…
wdconinc Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ cmake_policy(SET CMP0074 NEW) # find_package() uses <PackageName>_ROOT implicit

project(jana2 VERSION 2026.03.01)

include(GNUInstallDirs)

set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Enable -fPIC for all targets

# Default the C++ standard to C++17, and validate that they provided one we can use
Expand Down Expand Up @@ -164,14 +166,14 @@ if (USE_PERFETTO)
add_library(perfetto_sdk STATIC ${PERFETTO_SDK_DIR}/perfetto.cc)
target_include_directories(perfetto_sdk PUBLIC
$<BUILD_INTERFACE:${PERFETTO_SDK_DIR}>
$<INSTALL_INTERFACE:include/perfetto>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/perfetto>
)
target_compile_options(perfetto_sdk PRIVATE
$<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
-Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers>
)
install(TARGETS perfetto_sdk EXPORT jana2_targets DESTINATION lib)
install(FILES ${PERFETTO_SDK_DIR}/perfetto.h DESTINATION include/perfetto)
install(TARGETS perfetto_sdk EXPORT jana2_targets DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${PERFETTO_SDK_DIR}/perfetto.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/perfetto)
set(JANA2_HAVE_PERFETTO 1)
else()
set(JANA2_HAVE_PERFETTO 0)
Expand Down Expand Up @@ -278,10 +280,10 @@ endif()

#---------------------------------------------------------------------------------------

install(DIRECTORY scripts/ DESTINATION bin FILES_MATCHING PATTERN "jana-*.py"
install(DIRECTORY scripts/ DESTINATION ${CMAKE_INSTALL_BINDIR} FILES_MATCHING PATTERN "jana-*.py"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)

install(FILES "scripts/jana-status.sh" RENAME "jana-status" DESTINATION "bin"
install(FILES "scripts/jana-status.sh" RENAME "jana-status" DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)

include(${CMAKE_SOURCE_DIR}/cmake/MakeConfig.cmake)
Expand Down
13 changes: 7 additions & 6 deletions cmake/AddJanaLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include(GNUInstallDirs)

macro(add_jana_library library_name)

Expand Down Expand Up @@ -61,7 +62,7 @@ macro(add_jana_library library_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}
)

target_link_libraries(${library_name} PUBLIC "${JANA_NAMESPACE}jana2_static_lib")
Expand All @@ -78,15 +79,15 @@ macro(add_jana_library library_name)
target_include_directories(${library_name}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/${INSTALL_NAMESPACE}/${CWD_NAME}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${INSTALL_NAMESPACE}/${CWD_NAME}>
)
Comment thread
wdconinc marked this conversation as resolved.
endif()

# Install target
install(TARGETS ${library_name}
EXPORT ${LIBRARY_EXPORT}
PUBLIC_HEADER DESTINATION include/${INSTALL_NAMESPACE}/${CWD_NAME}
LIBRARY DESTINATION lib
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${INSTALL_NAMESPACE}/${CWD_NAME}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

# Handle tests
Expand All @@ -97,9 +98,9 @@ macro(add_jana_library library_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}
)
#install(TARGETS ${library_name}_tests RUNTIME DESTINATION bin)
#install(TARGETS ${library_name}_tests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
add_test(NAME ${library_name}_tests COMMAND ${library_name}_tests)
set_tests_properties(${library_name}_tests PROPERTIES
ENVIRONMENT "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:${library_name}>:$<TARGET_FILE_DIR:jana2_shared_lib>:$ENV{LD_LIBRARY_PATH}"
Expand Down
14 changes: 8 additions & 6 deletions cmake/AddJanaPlugin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

include(GNUInstallDirs)

macro(add_jana_plugin plugin_name)

# Parse remaining arguments
Expand Down Expand Up @@ -69,7 +71,7 @@ macro(add_jana_plugin plugin_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/${INSTALL_NAMESPACE}/plugins"
INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR};${CMAKE_INSTALL_LIBDIR}/${INSTALL_NAMESPACE}/plugins"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/JANA/plugins"
)

Expand All @@ -83,15 +85,15 @@ macro(add_jana_plugin plugin_name)
target_include_directories(${plugin_name}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/${INSTALL_NAMESPACE}/plugins/${plugin_name}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${INSTALL_NAMESPACE}/plugins/${plugin_name}>
)
Comment thread
wdconinc marked this conversation as resolved.
endif()

# Install target
install(TARGETS ${plugin_name}
EXPORT ${PLUGIN_EXPORT}
PUBLIC_HEADER DESTINATION include/${INSTALL_NAMESPACE}/plugins/${plugin_name}
LIBRARY DESTINATION lib/${INSTALL_NAMESPACE}/plugins
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${INSTALL_NAMESPACE}/plugins/${plugin_name}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${INSTALL_NAMESPACE}/plugins
)

# Handle tests
Expand All @@ -102,9 +104,9 @@ macro(add_jana_plugin plugin_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/${INSTALL_NAMESPACE}/plugins"
INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR};${CMAKE_INSTALL_LIBDIR}/${INSTALL_NAMESPACE}/plugins"
)
#install(TARGETS ${plugin_name}-tests RUNTIME DESTINATION bin)
#install(TARGETS ${plugin_name}-tests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
add_test(NAME ${plugin_name}-tests COMMAND ${plugin_name}-tests)
set_tests_properties(${plugin_name}-tests PROPERTIES
ENVIRONMENT "JANA_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/JANA/plugins;LD_LIBRARY_PATH=$<TARGET_FILE_DIR:jana2_shared_lib>:$ENV{LD_LIBRARY_PATH}"
Expand Down
5 changes: 3 additions & 2 deletions cmake/AddJanaTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include(GNUInstallDirs)

macro(add_jana_test test_target_name)

Expand Down Expand Up @@ -31,9 +32,9 @@ macro(add_jana_test test_target_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/JANA/plugins")
INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR};${CMAKE_INSTALL_LIBDIR}/JANA/plugins")

install(TARGETS ${test_target_name} RUNTIME DESTINATION bin)
install(TARGETS ${test_target_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
Comment thread
wdconinc marked this conversation as resolved.

add_test(NAME ${test_target_name} COMMAND ${test_target_name})
set_tests_properties(${test_target_name} PROPERTIES
Expand Down
14 changes: 7 additions & 7 deletions cmake/MakeConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include(CMakePackageConfigHelpers)
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/JANAConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake/JANAConfig.cmake"
INSTALL_DESTINATION "lib/JANA/cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake"
)

write_basic_package_version_file(
Expand All @@ -16,20 +16,20 @@ write_basic_package_version_file(
install(EXPORT jana2_targets
FILE "JANATargets.cmake"
NAMESPACE JANA::
DESTINATION "lib/JANA/cmake")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake")

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/JANAConfig.cmake"
DESTINATION "lib/JANA/cmake")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake")

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/JANAConfigVersion.cmake"
DESTINATION "lib/JANA/cmake")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake")

install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddJanaPlugin.cmake"
DESTINATION "lib/JANA/cmake")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake")

install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddJanaLibrary.cmake"
DESTINATION "lib/JANA/cmake")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake")

install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddJanaTest.cmake"
DESTINATION "lib/JANA/cmake")
DESTINATION "${CMAKE_INSTALL_LIBDIR}/JANA/cmake")

2 changes: 1 addition & 1 deletion cmake/MakeJVersionH.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ endif()
message(STATUS "Generating JVersion.h")

configure_file(src/libraries/JANA/JVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/libraries/JANA/JVersion.h @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libraries/JANA/JVersion.h DESTINATION include/JANA)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libraries/JANA/JVersion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/JANA)
6 changes: 3 additions & 3 deletions cmake/MakeJanaThis.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ configure_file(scripts/jana-config.in jana-config @ONLY)
configure_file(scripts/jana-this.sh.in jana-this.sh @ONLY)
configure_file(scripts/jana-this.csh.in jana-this.csh @ONLY)

install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-config DESTINATION bin)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.sh DESTINATION bin)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.csh DESTINATION bin)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-config DESTINATION ${CMAKE_INSTALL_BINDIR})
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.sh DESTINATION ${CMAKE_INSTALL_BINDIR})
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.csh DESTINATION ${CMAKE_INSTALL_BINDIR})
8 changes: 5 additions & 3 deletions scripts/jana-config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ fi


CMAKE_INSTALL_PREFIX="@CMAKE_INSTALL_PREFIX@"
CMAKE_INSTALL_LIBDIR="@CMAKE_INSTALL_LIBDIR@"
CMAKE_INSTALL_INCLUDEDIR="@CMAKE_INSTALL_INCLUDEDIR@"
CMAKE_CXX_STANDARD="@CMAKE_CXX_STANDARD@"

JANA_VERSION="@PROJECT_VERSION@"
Expand Down Expand Up @@ -116,16 +118,16 @@ while test $# -gt 0; do

case $1 in
--cflags|--cxxflags)
mess="$mess -I${JANA_INSTALL_DIR}/include ${CPPFLAGS}"
mess="$mess -I${JANA_INSTALL_INCLUDEDIR} ${CPPFLAGS}"
;;
--version|-v)
mess="${JANA_VERSION}"
;;
--libs)
mess="$mess -Wl,-rpath,${JANA_INSTALL_DIR}/lib -L${JANA_INSTALL_DIR}/lib -lJANA ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
mess="$mess -Wl,-rpath,${CMAKE_INSTALL_LIBDIR} -L${CMAKE_INSTALL_LIBDIR} -lJANA ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
;;
--static-libs)
mess="$mess ${JANA_INSTALL_DIR}/lib/libJANA.a ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
mess="$mess ${CMAKE_INSTALL_LIBDIR}/libJANA.a ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
;;
--jana-only)
CPPFLAGS=""
Expand Down
14 changes: 11 additions & 3 deletions scripts/jana-generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ class {name} : public JEventSource {{
cmake_minimum_required(VERSION 3.9)
project({name}_project)

include(GNUInstallDirs)

if(NOT "${{CMAKE_CXX_STANDARD}}")
set(CMAKE_CXX_STANDARD 17)
endif()
Expand Down Expand Up @@ -354,6 +356,8 @@ class {name} : public JEventSource {{
plugin_cmakelists_txt = """
{extra_find_packages}

include(GNUInstallDirs)

# According to the internet, CMake authors discourage the use
# of GLOB for identifying source files. IMHO, this is due to
# the flawed use of cache files in CMake itself. Here, GLOB
Expand Down Expand Up @@ -384,7 +388,7 @@ class {name} : public JEventSource {{
install(TARGETS {name}_plugin DESTINATION plugins)

file(GLOB my_headers "*.h*")
install(FILES ${{my_headers}} DESTINATION include/{name})
install(FILES ${{my_headers}} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/{name})

@veprbl veprbl Sep 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if is_standalone=False? Probably can slap an include GNUInstallDirs to every snippet that creates a target?


# For root dictionaries
file(GLOB my_pcms "${{CMAKE_CURRENT_BINARY_DIR}}/*.pcm")
Expand All @@ -396,6 +400,8 @@ class {name} : public JEventSource {{
mini_plugin_cmakelists_txt = """
{extra_find_packages}

include(GNUInstallDirs)

# According to the internet, CMake authors discourage the use
# of GLOB for identifying source files. IMHO, this is due to
# the flawed use of cache files in CMake itself. Here, GLOB
Expand Down Expand Up @@ -424,7 +430,7 @@ class {name} : public JEventSource {{
install(TARGETS {name}_plugin DESTINATION plugins)

file(GLOB my_headers "*.h*")
install(FILES ${{my_headers}} DESTINATION include/{name})
install(FILES ${{my_headers}} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/{name})

# For root dictionaries
file(GLOB my_pcms "${{CMAKE_CURRENT_BINARY_DIR}}/*.pcm")
Expand All @@ -435,6 +441,8 @@ class {name} : public JEventSource {{

plugin_tests_cmakelists_txt = """

include(GNUInstallDirs)

set ({name}_PLUGIN_TESTS_SOURCES
catch.hpp
TestsMain.cc
Expand All @@ -452,7 +460,7 @@ class {name} : public JEventSource {{
target_link_libraries({name}_plugin_tests {name}_plugin)
target_link_libraries({name}_plugin_tests ${{JANA_LIBRARY}})

install(TARGETS {name}_plugin_tests DESTINATION bin)
install(TARGETS {name}_plugin_tests DESTINATION ${CMAKE_INSTALL_BINDIR})

"""

Expand Down
10 changes: 5 additions & 5 deletions src/examples/misc/PodioDatamodel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ if (USE_PODIO)

install(TARGETS PodioDatamodel
EXPORT jana2_targets
LIBRARY DESTINATION lib
PUBLIC_HEADER DESTINATION include/JANA/examples/PodioDatamodel
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/JANA/examples/PodioDatamodel
)

install(TARGETS PodioDatamodelDict
EXPORT jana2_targets
DESTINATION lib
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PodioDatamodelDictDict.rootmap DESTINATION lib)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPodioDatamodelDict_rdict.pcm DESTINATION lib)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PodioDatamodelDictDict.rootmap DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPodioDatamodelDict_rdict.pcm DESTINATION ${CMAKE_INSTALL_LIBDIR})

else()
message(STATUS "Skipping examples/PodioDatamodel because USE_PODIO=Off")
Expand Down
2 changes: 1 addition & 1 deletion src/examples/misc/RootDatamodelExample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if(${USE_ROOT})
target_link_libraries(RootDatamodelExample PUBLIC ROOT::Core)

message(STATUS "Installing ROOT PCM files: ${my_pcms}")
install(FILES ${my_pcms} DESTINATION lib/JANA/plugins)
install(FILES ${my_pcms} DESTINATION ${CMAKE_INSTALL_LIBDIR}/JANA/plugins)

add_test(NAME jana-example-rootdatamodel-tests
COMMAND $<TARGET_FILE:jana> -Pplugins=RootDatamodelExample -Pjana:nevents=10)
Expand Down
2 changes: 1 addition & 1 deletion src/examples/misc/SubeventCUDAExample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (USE_CUDA)
OUTPUT_NAME "SubeventCUDAExample"
CUDA_ARCHITECTURES "75;80")

install(TARGETS SubeventCUDAExample DESTINATION bin)
install(TARGETS SubeventCUDAExample DESTINATION ${CMAKE_INSTALL_BINDIR})
add_test(NAME jana-example-subevent-cuda-tests
COMMAND SubeventCUDAExample)

Expand Down
2 changes: 1 addition & 1 deletion src/examples/misc/SubeventExample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
add_executable(SubeventExample SubeventExample.cc)
target_link_libraries(SubeventExample jana2)
set_target_properties(SubeventExample PROPERTIES PREFIX "" OUTPUT_NAME "SubeventExample")
install(TARGETS SubeventExample DESTINATION bin)
install(TARGETS SubeventExample DESTINATION ${CMAKE_INSTALL_BINDIR})

add_test(NAME jana-example-subevent-tests
COMMAND SubeventExample)
Expand Down
4 changes: 2 additions & 2 deletions src/examples/tutorial_with_lightweight_datamodel/01_datamodel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ add_library(lw_datamodel INTERFACE)

target_include_directories(lw_datamodel INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/jana2_tutorial_lightweight/01_datamodel>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/jana2_tutorial_lightweight/01_datamodel>
)

file(GLOB lw_datamodel_headers "*.h")

install(FILES ${lw_datamodel_headers}
DESTINATION include/jana2_tutorial_lightweight/01_datamodel)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jana2_tutorial_lightweight/01_datamodel)

install(TARGETS lw_datamodel
EXPORT jana2_targets)
Expand Down
2 changes: 1 addition & 1 deletion src/examples/tutorial_with_lightweight_datamodel/19_wrapper_program/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ target_link_libraries(lw-tutorial-recon PRIVATE
)
# Note that if you are outside the JANA2 source tree, you need to target_link_libraries against JANA::jana2_shared_lib instead

install(TARGETS lw-tutorial-recon DESTINATION bin)
install(TARGETS lw-tutorial-recon DESTINATION ${CMAKE_INSTALL_BINDIR})

10 changes: 5 additions & 5 deletions src/examples/tutorial_with_podio_datamodel/01_datamodel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ PODIO_ADD_ROOT_IO_DICT(jana2_tutorial_podio_datamodel_dict jana2_tutorial_podio_

install(TARGETS jana2_tutorial_podio_datamodel
EXPORT jana2_targets
LIBRARY DESTINATION lib
PUBLIC_HEADER DESTINATION include/jana2_tutorial_podio_datamodel
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jana2_tutorial_podio_datamodel
)

install(TARGETS jana2_tutorial_podio_datamodel_dict
EXPORT jana2_targets
DESTINATION lib
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jana2_tutorial_podio_datamodel_dictDict.rootmap DESTINATION lib)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libjana2_tutorial_podio_datamodel_dict_rdict.pcm DESTINATION lib)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jana2_tutorial_podio_datamodel_dictDict.rootmap DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libjana2_tutorial_podio_datamodel_dict_rdict.pcm DESTINATION ${CMAKE_INSTALL_LIBDIR})

Loading
Loading