BUILD: Fix some install targets

sandialabs · Oct 18, 2024 · 0c95ad2 · 0c95ad2
1 parent 63814bd
commit 0c95ad2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/packages/seacas/applications/explore/CMakeLists.txt b/packages/seacas/applications/explore/CMakeLists.txt
@@ -26,7 +26,7 @@ TRIBITS_ADD_EXECUTABLE(
 
 if (explore_added)
   if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas")
-    InstallSymLink(explore ${CMAKE_INSTALL_PREFIX}/bin/grope)
+    InstallSymLink(explore ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/grope)
   endif()
 endif()
 

diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
@@ -29,7 +29,7 @@ if (SEACASExodus_ENABLE_STATIC)
     set_target_properties(exoIIv2for32_static PROPERTIES OUTPUT_NAME exoIIv2for32)
     # This keeps the library out of the `all_libs` targets...
     set_target_properties(exoIIv2for32_static PROPERTIES TRIBITS_TESTONLY_LIB TRUE)
-    INSTALL(TARGETS exoIIv2for32_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+    INSTALL(TARGETS exoIIv2for32_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 TRIBITS_ADD_TEST_DIRECTORIES(test)

diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
@@ -50,7 +50,7 @@ if (SEACASExodus_ENABLE_SHARED)
       # This keeps the library out of the `all_libs` targets...
       set_target_properties(exodus_shared PROPERTIES TRIBITS_TESTONLY_LIB TRUE)
       set_target_properties(exodus_shared PROPERTIES OUTPUT_NAME exodus)
-      INSTALL(TARGETS exodus_shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+      INSTALL(TARGETS exodus_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif()
 endif()
 
@@ -68,11 +68,11 @@ if (SEACASExodus_ENABLE_STATIC)
    # This keeps the library out of the `all_libs` targets...
    set_target_properties(exodus_static PROPERTIES TRIBITS_TESTONLY_LIB TRUE)
    set_target_properties(exodus_static PROPERTIES OUTPUT_NAME exodus)
-   INSTALL(TARGETS exodus_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+   INSTALL(TARGETS exodus_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
    # For backwards compatibility, the C exodus library was called libexoIIv2c.a
    # Create a symbolic link from libexodus.a to libexoIIv2c.a -- do only for static lib
-   InstallSymLink(libexodus.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2c.a)
+   InstallSymLink(libexodus.a ${CMAKE_INSTALL_LIBDIR}/libexoIIv2c.a)
 endif()
 
 if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas")

diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt
@@ -37,11 +37,11 @@ if (SEACASExodus_ENABLE_STATIC)
    set_target_properties(exodus_for_static PROPERTIES OUTPUT_NAME exodus_for)
    # This keeps the library out of the `all_libs` targets...
    set_target_properties(exodus_for_static PROPERTIES TRIBITS_TESTONLY_LIB TRUE)
-   INSTALL(TARGETS exodus_for_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+   INSTALL(TARGETS exodus_for_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
    # For backwards compatibility, the Fortran exodus library was called libexoIIv2for.a
    # Create a symbolic link from libexodus_for.a to libexoIIv2for.a -- do only for static lib
-   InstallSymLink(libexodus_for.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2for.a)
+   InstallSymLink(libexodus_for.a ${CMAKE_INSTALL_LIBDIR}/libexoIIv2for.a)
 endif()
 
 TRIBITS_ADD_TEST_DIRECTORIES(test)

diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/catalyst/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright(C) 1999-2021 National Technology & Engineering Solutions
+# Copyright(C) 1999-2021, 2024 National Technology & Engineering Solutions
 # of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 # NTESS, the U.S. Government retains certain rights in this software.
 #
@@ -29,11 +29,11 @@ ENDIF()
 
 SET(CMAKE_SKIP_BUILD_RPATH FALSE)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" ${PARAVIEW_PYTHON_LIBRARY_RPATH_DIRECTORY})
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}" ${PARAVIEW_PYTHON_LIBRARY_RPATH_DIRECTORY})
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
 IF("${isSystemDir}" STREQUAL "-1")
-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
 ENDIF()
 
 INCLUDE_DIRECTORIES("manager")