From 0dd45c89fc3a14226fa6cb290adb682e0e9245e2 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Mon, 17 Oct 2022 23:28:03 -0400 Subject: [PATCH 1/2] BUG: Remove hard-coded lib dir that was breaking centos builds --- SuperBuild/External_ITKv5.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild/External_ITKv5.cmake b/SuperBuild/External_ITKv5.cmake index 677eb6771..c069a792a 100644 --- 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) From 1ee1af267fd923f52f02058559fbec309485c849 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 18 Oct 2022 09:01:52 -0400 Subject: [PATCH 2/2] BUG: Change hard coded "lib/" in install path --- ANTS.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ANTS.cmake b/ANTS.cmake index 45da591a3..d2c02b1e2 100644 --- 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()