Merge pull request #1434 from ANTsX/centosBuild

BUG: Remove hard-coded lib dir that was breaking centos builds
ANTsX · Oct 18, 2022 · 5dddad5 · 5dddad5
2 parents 7d6fccf + 1ee1af2
commit 5dddad5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ANTS.cmake b/ANTS.cmake
@@ -163,6 +163,6 @@ endif()
 
 #Only install ITK/VTK libraries if shared build and superbuild is used
 if(BUILD_SHARED_LIBS AND ((NOT USE_SYSTEM_ITK) OR ((NOT USE_SYSTEM_VTK) AND USE_VTK)))
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/../staging/lib/
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/../staging/${CMAKE_INSTALL_LIBDIR}/
           DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
diff --git a/SuperBuild/External_ITKv5.cmake b/SuperBuild/External_ITKv5.cmake
@@ -178,7 +178,7 @@ if(NOT DEFINED ${extProjName}_DIR AND NOT ${USE_SYSTEM_${extProjName}})
     DEPENDS
       ${${proj}_DEPENDENCIES}
   )
-  set(${extProjName}_DIR ${CMAKE_BINARY_DIR}/staging/lib/cmake/${ITK_VERSION_ID})
+  set(${extProjName}_DIR ${CMAKE_BINARY_DIR}/staging/${CMAKE_INSTALL_LIBDIR}/cmake/${ITK_VERSION_ID})
 else()
   if(${USE_SYSTEM_${extProjName}})
     find_package(${extProjName} ${ITK_VERSION_MAJOR} REQUIRED)