Commit ddfcd0f4 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'remove-CM24-vars' into master

2f5fdb13 Removed the deprecated _CM24 CMake variables
parents 00e31d88 2f5fdb13
......@@ -100,9 +100,9 @@ function(VTK_CREATE_SIP_MODULE KIT WRAP_SRCS)
IF(VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtk${KIT}PythonSIP
EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development)
ENDIF(VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF(NOT SIP_EXECUTABLE)
endfunction(VTK_CREATE_SIP_MODULE)
......@@ -106,13 +106,6 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE_TOOLS_IMPORTED)
set (COMPILE_TOOLS_IMPORTED TRUE)
endif()
# FIXME: These will be removed, used by vtkzlib etc
set(VTK_INSTALL_BIN_DIR_CM24 ${VTK_INSTALL_RUNTIME_DIR})
set(VTK_INSTALL_LIB_DIR_CM24 ${VTK_INSTALL_LIBRARY_DIR})
set(VTK_INSTALL_PACKAGE_DIR_CM24 ${VTK_INSTALL_PACKAGE_DIR})
set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR})
set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
#-----------------------------------------------------------------------------
# The third party macros are still used in one or two third party builds.
include(vtkThirdParty)
......
......@@ -17,7 +17,7 @@
#define __vtkDomainsChemistryConfigure_h
/* Where the Blue Obelisk Data Repository files are installed */
#define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_SHARE_DIR_CM24@/vtkChemistry/vtkBODRData"
#define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_DATA_DIR@/vtkChemistry/vtkBODRData"
#define VTK_BODR_DATA_PATH_BUILD "@VTK_SOURCE_DIR@/Domains/Chemistry"
#endif
......@@ -23,14 +23,14 @@ if(VTK_MFC_EXTRA_LIBS)
target_link_libraries(${vtk-module} ${VTK_MFC_EXTRA_LIBS})
endif(VTK_MFC_EXTRA_LIBS)
if ( WIN32 )
if(WIN32)
if(NOT VTK_INSTALL_NO_DEVELOPMENT)
file(GLOB vtkMFCHeaderFiles "*.h")
set(vtkMFCHeaderFiles ${vtkMFCHeaderFiles}
"${CMAKE_CURRENT_BINARY_DIR}/vtkMFCConfigure.h")
install(FILES ${vtkMFCHeaderFiles}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}
COMPONENT Development
)
endif(NOT VTK_INSTALL_NO_DEVELOPMENT)
endif ( WIN32 )
endif()
endif()
......@@ -61,6 +61,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
${Cosmo_SOURCE_DIR}/Partition.h
${Cosmo_SOURCE_DIR}/winDirent.h
${Cosmo_BINARY_DIR}/CosmoDefinition.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/Cosmo
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/Cosmo
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -6,7 +6,7 @@ IF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
FILE(GLOB tkResourceFiles "*.bmp" "*.cur" "*.ico" "*.manifest" "*.rc")
INSTALL(FILES
${tkResourceFiles}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/TclTk/resources/tk8.3/win/rc
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/TclTk/resources/tk8.3/win/rc
COMPONENT Development
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -6,7 +6,7 @@ IF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
FILE(GLOB tkResourceFiles "*.bmp" "*.cur" "*.ico" "*.manifest" "*.rc")
INSTALL(FILES
${tkResourceFiles}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/TclTk/resources/tk8.4/win/rc
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/TclTk/resources/tk8.4/win/rc
COMPONENT Development
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -6,7 +6,7 @@ IF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
FILE(GLOB tkResourceFiles "*.bmp" "*.cur" "*.ico" "*.manifest" "*.rc")
INSTALL(FILES
${tkResourceFiles}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/TclTk/resources/tk8.5/win/rc
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/TclTk/resources/tk8.5/win/rc
COMPONENT Development
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -6,7 +6,7 @@ IF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
FILE(GLOB tkResourceFiles "*.bmp" "*.cur" "*.ico" "*.manifest" "*.rc")
INSTALL(FILES
${tkResourceFiles}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/TclTk/resources/tk8.6/win/rc
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/TclTk/resources/tk8.6/win/rc
COMPONENT Development
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -50,6 +50,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
${VPIC_SOURCE_DIR}/VPICView.h
${VPIC_SOURCE_DIR}/GridExchange.h
${VPIC_BINARY_DIR}/VPICDefinition.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/VPIC
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/VPIC
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -37,11 +37,11 @@ vtk_add_library( vtkalglib
#
# Grab install locations from VTK if we are building as part of VTK
if ( VTK_INSTALL_INCLUDE_DIR_CM24 )
set( alglib_install_inc_dir ${VTK_INSTALL_INCLUDE_DIR_CM24} )
else ( VTK_INSTALL_INCLUDE_DIR_CM24 )
set( alglib_install_inc_dir ${CMAKE_INSTALL_PREFIX}/include )
endif ( VTK_INSTALL_INCLUDE_DIR_CM24 )
if(VTK_INSTALL_INCLUDE_DIR)
set(alglib_install_inc_dir ${VTK_INSTALL_INCLUDE_DIR})
else()
set(alglib_install_inc_dir ${CMAKE_INSTALL_PREFIX}/include)
endif()
# Header files:
if ( NOT VTK_INSTALL_NO_DEVELOPMENT )
......
......@@ -27,6 +27,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
${VTKEXPAT_BINARY_DIR}/expatDllConfig.h
${VTKEXPAT_SOURCE_DIR}/expat.h
${VTKEXPAT_SOURCE_DIR}/vtk_expat_mangle.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkexpat
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/vtkexpat
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -129,13 +129,13 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
${VTKFREETYPE_SOURCE_DIR}/include/vtk_freetype_mangle.h
${VTKFREETYPE_SOURCE_DIR}/include/vtk_ftmodule.h
${VTKFREETYPE_BINARY_DIR}/include/vtkFreeTypeConfig.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkfreetype/include
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/vtkfreetype/include
COMPONENT Development)
file(GLOB freetype_headers
"${VTKFREETYPE_SOURCE_DIR}/include/freetype/*.h")
INSTALL(FILES ${freetype_headers}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkfreetype/include/freetype
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/vtkfreetype/include/freetype
COMPONENT Development)
file(GLOB freetype_config_headers
......@@ -145,6 +145,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
endif()
INSTALL(FILES ${freetype_config_headers}
${freetype_config_headers_include}
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkfreetype/include/freetype/config
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/vtkfreetype/include/freetype/config
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -21,9 +21,6 @@ set(HDF5_INSTALL_RUNTIME_DIR ${VTK_INSTALL_RUNTIME_DIR})
set(HDF5_INSTALL_INCLUDE_DIR ${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5)
set(HDF5_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
set(HDF5_INSTALL_BIN_DIR ${VTK_INSTALL_BIN_DIR_CM24})
set(HDF5_INSTALL_LIB_DIR ${VTK_INSTALL_LIB_DIR_CM24})
# Configure HDF5 privately so its options do not appear to the user.
set(HDF5_ALLOW_EXTERNAL_SUPPORT OFF CACHE INTERNAL "Allow External Library Building")
set(HDF5_BUILD_CPP_LIB OFF CACHE INTERNAL "Build HDF5 C++ Library")
......
......@@ -565,7 +565,7 @@ INSTALL (
FILES
${PROJECT_BINARY_DIR}/H5pubconf.h
DESTINATION
${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkhdf5
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5
)
ENDIF (NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -94,7 +94,7 @@ INSTALL (
FILES
${CPP_HDRS}
DESTINATION
${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkhdf5/cpp
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5/cpp
)
ENDIF (NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -107,9 +107,9 @@ IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
${HDF5_CPP_LIB_TARGET}
EXPORT
${HDF5_EXPORTED_TARGETS}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development
)
ENDIF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
......@@ -25,7 +25,7 @@ INSTALL (
FILES
${HDF5_HL_CPP_HDRS}
DESTINATION
${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkhdf5/hl/cpp
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5/hl/cpp
)
#-----------------------------------------------------------------------------
......@@ -37,8 +37,8 @@ IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
${HDF5_HL_CPP_LIB_TARGET}
EXPORT
${HDF5_EXPORTED_TARGETS}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development
)
ENDIF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
......@@ -654,7 +654,7 @@ INSTALL (
${H5_PUBLIC_HEADERS}
${H5_PRIVATE_HEADERS}
DESTINATION
${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkhdf5
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5
)
ENDIF (NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -53,6 +53,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
${VTKJPEG_SOURCE_DIR}/jconfig.h
${VTKJPEG_SOURCE_DIR}/jmorecfg.h
${VTKJPEG_SOURCE_DIR}/jerror.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/vtkjpeg
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/vtkjpeg
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -224,6 +224,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
${libproj4_SOURCE_DIR}/lib_proj.h
${libproj4_SOURCE_DIR}/vtk_libproj4_mangle.h
${libproj4_BINARY_DIR}/proj_config.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/vtklibproj4
DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/vtklibproj4
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment