From b85da71dd4e48aabaaad92f0f818e366831cd373 Mon Sep 17 00:00:00 2001 From: Sajid Ali Date: Wed, 3 Jul 2024 15:27:17 -0400 Subject: [PATCH] rename LIB_INSTALL_DIR to SYNERGIA3_LIB_INSTALL_DIR to prevent clashes with Eigen3 --- CMakeLists.txt | 4 ++-- src/analysis_tools/CMakeLists.txt | 2 +- src/synergia/CMakeLists.txt | 2 +- src/synergia/bunch/CMakeLists.txt | 4 ++-- src/synergia/foundation/CMakeLists.txt | 2 +- src/synergia/lattice/CMakeLists.txt | 2 +- src/synergia/simulation/CMakeLists.txt | 2 +- src/synergia/utils/CMakeLists.txt | 4 ++-- synergia-script-templates/CMakeLists.txt | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc0e1bf67..b806096d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -442,7 +442,7 @@ add_dependencies(check test-exes) set(SYNERGIA3_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "include install directory") -set(LIB_INSTALL_DIR +set(SYNERGIA3_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/" CACHE PATH "library install directory") set(BIN_INSTALL_DIR @@ -461,7 +461,7 @@ set(SYNERGIA_EXTRA_PYTHON_PATHS set(CMAKE_SKIP_BUILD_RPATH FALSE) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") +set(CMAKE_INSTALL_RPATH "${SYNERGIA3_LIB_INSTALL_DIR}") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # possibly move the following to using block/endblock when cmake min version diff --git a/src/analysis_tools/CMakeLists.txt b/src/analysis_tools/CMakeLists.txt index 4f5267da8..11a133192 100644 --- a/src/analysis_tools/CMakeLists.txt +++ b/src/analysis_tools/CMakeLists.txt @@ -39,4 +39,4 @@ install( tracks_to_text.py particles_to_madX_text.py decode_mad8_twiss.py - DESTINATION ${LIB_INSTALL_DIR}/synergia_tools) + DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}/synergia_tools) diff --git a/src/synergia/CMakeLists.txt b/src/synergia/CMakeLists.txt index 4b7d84f48..6c92abfaf 100644 --- a/src/synergia/CMakeLists.txt +++ b/src/synergia/CMakeLists.txt @@ -28,6 +28,6 @@ if(BUILD_PYTHON_BINDINGS) copy_file(__init__.py synergia) endif() -install(TARGETS synergia DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS synergia DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install(FILES __init__.py "${CMAKE_CURRENT_BINARY_DIR}/version.py" DESTINATION ${PYTHON_INSTALL_DIR}/synergia) diff --git a/src/synergia/bunch/CMakeLists.txt b/src/synergia/bunch/CMakeLists.txt index b45b428d8..f31e0e1b9 100644 --- a/src/synergia/bunch/CMakeLists.txt +++ b/src/synergia/bunch/CMakeLists.txt @@ -49,13 +49,13 @@ if(BUILD_PYTHON_BINDINGS) copy_file(__init__.py bunch) install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/synergia/bunch) - install(TARGETS synergia_pydiag DESTINATION ${LIB_INSTALL_DIR}) + install(TARGETS synergia_pydiag DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install(TARGETS bunch DESTINATION ${PYTHON_INSTALL_DIR}/synergia/bunch) endif() install(TARGETS synergia_bunch synergia_bunch_hostonly - DESTINATION ${LIB_INSTALL_DIR}) + DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install( FILES bunch.h diff --git a/src/synergia/foundation/CMakeLists.txt b/src/synergia/foundation/CMakeLists.txt index 9cdce880b..eacf17849 100644 --- a/src/synergia/foundation/CMakeLists.txt +++ b/src/synergia/foundation/CMakeLists.txt @@ -18,7 +18,7 @@ if(BUILD_PYTHON_BINDINGS) copy_file(__init__.py foundation) endif() -install(TARGETS synergia_foundation DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS synergia_foundation DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install(FILES distribution.h four_momentum.h physical_constants.h reference_particle.h DESTINATION ${SYNERGIA3_INCLUDE_INSTALL_DIR}/synergia/foundation) diff --git a/src/synergia/lattice/CMakeLists.txt b/src/synergia/lattice/CMakeLists.txt index aff3620f9..f50a75c0d 100644 --- a/src/synergia/lattice/CMakeLists.txt +++ b/src/synergia/lattice/CMakeLists.txt @@ -28,7 +28,7 @@ if(BUILD_PYTHON_BINDINGS) endif() install(TARGETS synergia_lattice synergia_lattice_hostonly - DESTINATION ${LIB_INSTALL_DIR}) + DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install( FILES lattice_element.h diff --git a/src/synergia/simulation/CMakeLists.txt b/src/synergia/simulation/CMakeLists.txt index 2f07fe536..84e72b566 100644 --- a/src/synergia/simulation/CMakeLists.txt +++ b/src/synergia/simulation/CMakeLists.txt @@ -37,7 +37,7 @@ if(BUILD_PYTHON_BINDINGS) endif() install(TARGETS synergia_simulation_hostonly synergia_simulation - synergia_bunchsim DESTINATION ${LIB_INSTALL_DIR}) + synergia_bunchsim DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install( FILES bunch_simulator.h diff --git a/src/synergia/utils/CMakeLists.txt b/src/synergia/utils/CMakeLists.txt index 7cd964a84..d2c719c10 100644 --- a/src/synergia/utils/CMakeLists.txt +++ b/src/synergia/utils/CMakeLists.txt @@ -90,8 +90,8 @@ endif() install(TARGETS synergia_parallel_utils synergia_distributed_fft synergia_serialization synergia_command_line lsexpr - DESTINATION ${LIB_INSTALL_DIR}) -install(TARGETS synergia_hdf5_utils DESTINATION ${LIB_INSTALL_DIR}) + DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) +install(TARGETS synergia_hdf5_utils DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}) install( FILES command_line_arg.h diff --git a/synergia-script-templates/CMakeLists.txt b/synergia-script-templates/CMakeLists.txt index ac4879952..9ec3600ec 100644 --- a/synergia-script-templates/CMakeLists.txt +++ b/synergia-script-templates/CMakeLists.txt @@ -25,4 +25,4 @@ install( intrepid_resumemulti_footer intrepid_resumemulti_header resume_intrepid - DESTINATION ${LIB_INSTALL_DIR}/synergia-script-templates) + DESTINATION ${SYNERGIA3_LIB_INSTALL_DIR}/synergia-script-templates)