rename LIB_INSTALL_DIR to SYNERGIA3_LIB_INSTALL_DIR to prevent clashe…

…s with Eigen3
fnalacceleratormodeling · Jul 3, 2024 · b85da71 · b85da71
1 parent 697304e
commit b85da71
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)