diff --git a/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt index c5c71a6e042..71dc02ff7f0 100644 --- a/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt @@ -16,9 +16,7 @@ SUBDIRS(vcl v3p core) # Standard include directories. SET(VXLCORE_INCLUDE_DIR ${vxl_BINARY_DIR}/core ${vxl_SOURCE_DIR}/core) -SET(VXLCORE_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/core) SET(VCL_INCLUDE_DIR ${vxl_BINARY_DIR}/vcl ${vxl_SOURCE_DIR}/vcl) -SET(VCL_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/vcl) INCLUDE_DIRECTORIES(${VCL_INCLUDE_DIR} ${VXLCORE_INCLUDE_DIR}) diff --git a/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt index e63f82e64a7..c00eb0079e7 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt @@ -7,7 +7,7 @@ SET(global_sources ) IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/core ${global_sources}) + INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR} ${global_sources}) ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT) # common test executable diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/core/vnl/CMakeLists.txt index 0a9858af507..832185769fb 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/CMakeLists.txt @@ -260,7 +260,7 @@ ADD_LIBRARY(itkvnl ${vnl_sources}) TARGET_LINK_LIBRARIES( itkvnl itkvcl ) IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/core/vnl ${vnl_sources}) + INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/vnl ${vnl_sources}) ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT) IF(ITK_LIBRARY_PROPERTIES) diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/CMakeLists.txt index a807ff5616c..cb5a35bedab 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/CMakeLists.txt @@ -115,7 +115,7 @@ IF(NETLIB_FOUND) ARCHIVE DESTINATION ${VXL_INSTALL_ARCHIVE_DIR} COMPONENT Development) ENDIF(NOT VXL_INSTALL_NO_LIBRARIES) IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/core/vnl/algo ${vnl_algo_sources}) + INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/vnl/algo ${vnl_algo_sources}) ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT) IF( BUILD_TESTING ) diff --git a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt index c76f2b4cab0..59a8c0c0fc2 100644 --- a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt @@ -434,7 +434,7 @@ IF(NOT VXL_INSTALL_NO_LIBRARIES) ARCHIVE DESTINATION ${VXL_INSTALL_ARCHIVE_DIR} COMPONENT Development) ENDIF(NOT VXL_INSTALL_NO_LIBRARIES) IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/v3p/netlib ${v3p_netlib_sources}) + INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR} ${v3p_netlib_sources}) ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT) SUBDIRS(linalg) diff --git a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/linalg/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/linalg/CMakeLists.txt index 9220a7a74e5..7de7a5bedf9 100644 --- a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/linalg/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/linalg/CMakeLists.txt @@ -25,5 +25,5 @@ IF(NOT VXL_INSTALL_NO_LIBRARIES) ARCHIVE DESTINATION ${VXL_INSTALL_ARCHIVE_DIR} COMPONENT Development) ENDIF(NOT VXL_INSTALL_NO_LIBRARIES) IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/v3p/netlib ${V3P_NETLIB_lsqr_SOURCES}) + INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR} ${V3P_NETLIB_lsqr_SOURCES}) ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT) diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/vcl/CMakeLists.txt index ad4c20422e1..bfee21e9d32 100644 --- a/Modules/ThirdParty/VNL/src/vxl/vcl/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/vcl/CMakeLists.txt @@ -388,7 +388,7 @@ IF(NOT VXL_INSTALL_NO_LIBRARIES) ARCHIVE DESTINATION ${VXL_INSTALL_ARCHIVE_DIR} COMPONENT Development) ENDIF(NOT VXL_INSTALL_NO_LIBRARIES) IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR}/vcl ${vcl_sources}) + INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_INCLUDE_DIR} ${vcl_sources}) ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT) # INCLUDE( ${vxl_SOURCE_DIR}/vcl/LinkSTLPort.cmake ) diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_sys/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_sys/CMakeLists.txt index 61e95297250..b88df65ec5a 100644 --- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_sys/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_sys/CMakeLists.txt @@ -1,3 +1,3 @@ IF(NOT VXL_INSTALL_NO_DEVELOPMENT) - INSTALL_FILES(${VXL_INSTALL_INCLUDE_DIR}/vcl/vcl_sys "(\\.h|\\.txx)$") + INSTALL_FILES(${VXL_INSTALL_INCLUDE_DIR}/vcl_sys "(\\.h|\\.txx)$") ENDIF(NOT VXL_INSTALL_NO_DEVELOPMENT)