commit edaee7e4b314e98e05296110e6a11ec5088c703c Author: Brad King Date: Mon Jan 28 18:47:38 2008 +0000 ENH: Updated call to EXPORT() command for new signature in CVS CMake. diff --git a/CMakeLists.txt b/CMakeLists.txt index 0258d7d..a6a8066 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ IF(CMAKE_CROSSCOMPILING) ENDIF(CMAKE_CROSSCOMPILING) SET(EXPORT_EXECUTABLES_FILE "${CMAKE_BINARY_DIR}/ParaView3CompileToolsConfig.cmake") -SET(EXPORT_EXECUTABLES_PREFIX "") +SET(EXPORT_EXECUTABLES_NAMESPACE "") FILE(WRITE "${EXPORT_EXECUTABLES_FILE}" "#generated by Paraview, do not edit\n") diff --git a/Common/KWCommon/CMakeLists.txt b/Common/KWCommon/CMakeLists.txt index 1da05a6..2dfa81b 100644 --- a/Common/KWCommon/CMakeLists.txt +++ b/Common/KWCommon/CMakeLists.txt @@ -223,7 +223,7 @@ IF(KWCOMMON_BUILD_PROCESSXML) @ONLY IMMEDIATE) ADD_EXECUTABLE(kwProcessXML ${CMAKE_CURRENT_BINARY_DIR}/ProcessXML-forward.c) - EXPORT(TARGETS kwProcessXML FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS kwProcessXML FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) IF(NOT KWCommon_INSTALL_NO_DEVELOPMENT) INSTALL_TARGETS(${KWCommon_INSTALL_BIN_DIR} kwProcessXML) ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT) @@ -232,7 +232,7 @@ IF(KWCOMMON_BUILD_PROCESSXML) ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx) TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys) - EXPORT(TARGETS kwProcessXML${KWCommon_EXE_SUFFIX} FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS kwProcessXML${KWCommon_EXE_SUFFIX} FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) IF(NOT KWCommon_INSTALL_NO_DEVELOPMENT) INSTALL_TARGETS(${KWCommon_EXE_INSTALL} kwProcessXML${KWCommon_EXE_SUFFIX}) ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT) diff --git a/Servers/ServerManager/CMakeLists.txt b/Servers/ServerManager/CMakeLists.txt index 62c0a77..07c349b 100755 --- a/Servers/ServerManager/CMakeLists.txt +++ b/Servers/ServerManager/CMakeLists.txt @@ -347,7 +347,7 @@ SET(GUI_CONFIG_FILES IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(vtkSMExtractDocumentation${PV_EXE_SUFFIX} vtkSMExtractDocumentation.cxx) - EXPORT(TARGETS vtkSMExtractDocumentation${PV_EXE_SUFFIX} FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkSMExtractDocumentation${PV_EXE_SUFFIX} FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) # Add shared link forwarding executables if necessary. IF(PV_NEED_SHARED_FORWARD) diff --git a/Utilities/VTKClientServer/Wrapping/CMakeLists.txt b/Utilities/VTKClientServer/Wrapping/CMakeLists.txt index 0c4be1d..7e1fe56 100644 --- a/Utilities/VTKClientServer/Wrapping/CMakeLists.txt +++ b/Utilities/VTKClientServer/Wrapping/CMakeLists.txt @@ -5,7 +5,7 @@ IF(NOT CMAKE_CROSSCOMPILING) INCLUDE_DIRECTORIES(${ParaView_SOURCE_DIR}/VTK/Wrapping) ADD_EXECUTABLE(vtkWrapClientServer vtkWrapClientServer.c ${ParaView_SOURCE_DIR}/VTK/Wrapping/vtkParse.tab.c) - EXPORT(TARGETS vtkWrapClientServer FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkWrapClientServer FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) IF(NOT PV_INSTALL_NO_DEVELOPMENT) INSTALL_TARGETS(/lib/paraview-${PARAVIEW_VERSION} vtkWrapClientServer) diff --git a/Utilities/VTKPythonWrapping/CMakeLists.txt b/Utilities/VTKPythonWrapping/CMakeLists.txt index fc6fbd6..311894d 100644 --- a/Utilities/VTKPythonWrapping/CMakeLists.txt +++ b/Utilities/VTKPythonWrapping/CMakeLists.txt @@ -78,7 +78,7 @@ IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(vtkWrapPythonInit ${VTK_SOURCE_DIR}/Wrapping/vtkWrapPythonInit.c) - EXPORT(TARGETS vtkWrapPython vtkWrapPythonInit FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkWrapPython vtkWrapPythonInit FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) ENDIF(NOT CMAKE_CROSSCOMPILING) diff --git a/Utilities/hdf5/CMakeLists.txt b/Utilities/hdf5/CMakeLists.txt index cdb93a5..8174f0b 100644 --- a/Utilities/hdf5/CMakeLists.txt +++ b/Utilities/hdf5/CMakeLists.txt @@ -514,7 +514,7 @@ ENDIF(NOT VTKHDF5_INSTALL_NO_LIBRARIES) IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(H5detect H5detect.c) TARGET_LINK_LIBRARIES(H5detect ${LINK_LIBS}) - EXPORT(TARGETS H5detect FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS H5detect FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) ENDIF(NOT CMAKE_CROSSCOMPILING) GET_TARGET_PROPERTY(CMD H5detect LOCATION) diff --git a/VTK/CMakeLists.txt b/VTK/CMakeLists.txt index 4285f0f..2e32434 100644 --- a/VTK/CMakeLists.txt +++ b/VTK/CMakeLists.txt @@ -11,7 +11,7 @@ IF(NOT EXPORT_EXECUTABLES_FILE) ENDIF(CMAKE_CROSSCOMPILING) SET(EXPORT_EXECUTABLES_FILE "${CMAKE_BINARY_DIR}/VTKCompileToolsConfig.cmake") - SET(EXPORT_EXECUTABLES_PREFIX "") + SET(EXPORT_EXECUTABLES_NAMESPACE "") FILE(WRITE "${EXPORT_EXECUTABLES_FILE}" "#generated by VTK, do not edit\n") ENDIF(NOT EXPORT_EXECUTABLES_FILE) diff --git a/VTK/Utilities/MaterialLibrary/CMakeLists.txt b/VTK/Utilities/MaterialLibrary/CMakeLists.txt index 27e3ea0..5e59730 100644 --- a/VTK/Utilities/MaterialLibrary/CMakeLists.txt +++ b/VTK/Utilities/MaterialLibrary/CMakeLists.txt @@ -16,7 +16,7 @@ ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH AND NOT WIN32) IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(ProcessShader${ML_EXE_SUFFIX} ProcessShader.cxx) TARGET_LINK_LIBRARIES(ProcessShader${ML_EXE_SUFFIX} vtksys) - EXPORT(TARGETS ProcessShader${ML_EXE_SUFFIX} FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS ProcessShader${ML_EXE_SUFFIX} FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) # Add shared link forwarding executable if necessary. IF (NEED_SHARED_FORWARD) @@ -27,7 +27,7 @@ IF(NOT CMAKE_CROSSCOMPILING) @ONLY IMMEDIATE) ADD_EXECUTABLE(ProcessShader ${MaterialLibrary_BINARY_DIR}/ProcessShader-forward.c) ADD_DEPENDENCIES(ProcessShader ProcessShader${ML_EXE_SUFFIX}) - EXPORT(TARGETS ProcessShader FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS ProcessShader FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) ENDIF (NEED_SHARED_FORWARD) ENDIF(NOT CMAKE_CROSSCOMPILING) diff --git a/VTK/Utilities/ParseOGLExt/CMakeLists.txt b/VTK/Utilities/ParseOGLExt/CMakeLists.txt index e5279e7..1c94573 100644 --- a/VTK/Utilities/ParseOGLExt/CMakeLists.txt +++ b/VTK/Utilities/ParseOGLExt/CMakeLists.txt @@ -23,7 +23,7 @@ IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(vtkParseOGLExt Tokenizer.cxx ParseOGLExt.cxx) - EXPORT(TARGETS vtkParseOGLExt FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkParseOGLExt FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) ENDIF(NOT CMAKE_CROSSCOMPILING) diff --git a/VTK/Utilities/vtktiff/CMakeLists.txt b/VTK/Utilities/vtktiff/CMakeLists.txt index c7c9e18..b5f351a 100644 --- a/VTK/Utilities/vtktiff/CMakeLists.txt +++ b/VTK/Utilities/vtktiff/CMakeLists.txt @@ -36,7 +36,7 @@ ELSE (NOT UNIX) SET(common_SRCS ${common_SRCS} tif_unix.c tif_fax3sm.c) IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(mkg3states mkg3states.c) - EXPORT(TARGETS mkg3states FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS mkg3states FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) ENDIF(NOT CMAKE_CROSSCOMPILING) GET_TARGET_PROPERTY(mkg3statesExe mkg3states LOCATION) diff --git a/VTK/VolumeRendering/CMakeLists.txt b/VTK/VolumeRendering/CMakeLists.txt index be0b7b2..d4604c4 100755 --- a/VTK/VolumeRendering/CMakeLists.txt +++ b/VTK/VolumeRendering/CMakeLists.txt @@ -73,7 +73,7 @@ IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(vtkVREncodeString ${VTK_SOURCE_DIR}/VolumeRendering/vtkVREncodeString.cxx ) - EXPORT(TARGETS vtkVREncodeString FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkVREncodeString FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) ENDIF(NOT CMAKE_CROSSCOMPILING) GET_TARGET_PROPERTY(ENCODE_EXE vtkVREncodeString LOCATION) diff --git a/VTK/Wrapping/CMakeLists.txt b/VTK/Wrapping/CMakeLists.txt index 0660b62..245330c 100644 --- a/VTK/Wrapping/CMakeLists.txt +++ b/VTK/Wrapping/CMakeLists.txt @@ -9,7 +9,7 @@ IF(NOT CMAKE_CROSSCOMPILING) IF (VTK_WRAP_TCL) ADD_EXECUTABLE(vtkWrapTcl vtkWrapTcl.c vtkParse.tab.c) ADD_EXECUTABLE(vtkWrapTclInit vtkWrapTclInit.c) - EXPORT(TARGETS vtkWrapTcl vtkWrapTclInit FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkWrapTcl vtkWrapTclInit FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) IF(NOT VTK_INSTALL_NO_DEVELOPMENT) INSTALL(TARGETS vtkWrapTcl vtkWrapTclInit RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll @@ -21,7 +21,7 @@ IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(vtkWrapPython vtkWrapPython.c vtkParse.tab.c) ADD_EXECUTABLE(vtkWrapPythonInit vtkWrapPythonInit.c) TARGET_LINK_LIBRARIES(vtkWrapPython ${VTK_PYTHON_LIBRARIES}) - EXPORT(TARGETS vtkWrapPython vtkWrapPythonInit FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkWrapPython vtkWrapPythonInit FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) IF(NOT VTK_INSTALL_NO_DEVELOPMENT) INSTALL(TARGETS vtkWrapPython vtkWrapPythonInit RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll @@ -32,7 +32,7 @@ IF(NOT CMAKE_CROSSCOMPILING) IF (VTK_WRAP_JAVA) ADD_EXECUTABLE(vtkParseJava vtkParseJava.c vtkParse.tab.c) ADD_EXECUTABLE(vtkWrapJava vtkWrapJava.c vtkParse.tab.c) - EXPORT(TARGETS vtkParseJava vtkWrapJava FILE ${EXPORT_EXECUTABLES_FILE} PREFIX ${EXPORT_EXECUTABLES_PREFIX} APPEND) + EXPORT(TARGETS vtkParseJava vtkWrapJava FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) IF(NOT VTK_INSTALL_NO_DEVELOPMENT) INSTALL(TARGETS vtkParseJava vtkWrapJava RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll