diff --git a/Utilities/ITK/CMakeLists.txt b/Utilities/ITK/CMakeLists.txt index 136c4111fd16075ae5d4450fdbef0168b0f12e99..5d748a2e40dc80f18d260dfd4ae414a31e5bc825 100644 --- a/Utilities/ITK/CMakeLists.txt +++ b/Utilities/ITK/CMakeLists.txt @@ -307,7 +307,7 @@ IF(NOT ITK_INSTALL_BIN_DIR) # executable. If only a 32 or 64 bit version is available, the executable should go in # bin. So it seems better to let the packagers deal with that. # Ref: http://docs.sun.com/app/docs/doc/816-5138/dev-env-13?a=view - SET(ITK_INSTALL_BIN_DIR OTB_INSTALL_BIN_DIR) + SET(ITK_INSTALL_BIN_DIR ${OTB_INSTALL_BIN_DIR}) ENDIF(NOT ITK_INSTALL_BIN_DIR) IF(NOT ITK_INSTALL_LIB_DIR) @@ -334,15 +334,18 @@ IF(NOT ITK_INSTALL_LIB_DIR) ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*" AND CMAKE_SIZEOF_VOID_P EQUAL 8) # OTB Modifications # SET(ITK_INSTALL_LIB_DIR "/lib/InsightToolkit${sun64}") - SET(ITK_INSTALL_LIB_DIR OTB_INSTALL_LIB_DIR) + SET(ITK_INSTALL_LIB_DIR ${OTB_INSTALL_LIB_DIR}) ENDIF(NOT ITK_INSTALL_LIB_DIR) IF(NOT ITK_INSTALL_DATA_DIR) - SET(ITK_INSTALL_DATA_DIR OTB_INSTALL_DATA_DIR) + SET(ITK_INSTALL_DATA_DIR ${OTB_INSTALL_DATA_DIR}) ENDIF(NOT ITK_INSTALL_DATA_DIR) IF(NOT ITK_INSTALL_INCLUDE_DIR) - SET(ITK_INSTALL_INCLUDE_DIR OTB_INSTALL_INCLUDE_DIR) + # Actually this variable is set explicitely from otbIncludeDirectories.cmake + # so we never get there + # Just recall it here... + SET(ITK_INSTALL_INCLUDE_DIR ${OTB_INSTALL_INCLUDE_DIR}/Utilities/ITK) ENDIF(NOT ITK_INSTALL_INCLUDE_DIR) IF(NOT ITK_INSTALL_PACKAGE_DIR)