Commit e4fafcf1 authored by Berk Geveci's avatar Berk Geveci
Browse files

COMP: Fix to get it working with CMake 2.6

parent 5b05936e
PROJECT(pqClient)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
SET(QT_USE_QTASSISTANT TRUE)
SET(QT_USE_QTNETWORK TRUE) # QtAssistant depends on it (only for linking)
......
PROJECT(csClient)
CMAKE_MINIMUM_REQUIRED(VERSION 2.2)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_DIRECTORIES(
${csClient_SOURCE_DIR}
......
PROJECT(csServer)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_DIRECTORIES(
${ParaView_BINARY_DIR}
${ParaView_BINARY_DIR}/GUI/Client
......
......@@ -2,6 +2,10 @@ PROJECT(DobranoViz)
CMAKE_MINIMUM_REQUIRED(VERSION 2.2)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_DIRECTORIES(
${DobranoViz_SOURCE_DIR}
${DobranoViz_BINARY_DIR}
......
PROJECT(ParaView)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
IF(CMAKE_CROSSCOMPILING)
FIND_PACKAGE(ParaView3CompileTools REQUIRED)
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")
......@@ -18,7 +21,8 @@ ENDIF(NOT COMMAND EXPORT)
# GET_PROPERTY() will be in cmake 2.6
IF(COMMAND GET_PROPERTY)
GET_PROPERTY(PV_TARGET_SUPPORTS_SHARED_LIBS GLOBAL TARGET_SUPPORTS_SHARED_LIBS)
GET_PROPERTY(PV_TARGET_SUPPORTS_SHARED_LIBS
GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
ELSE(COMMAND GET_PROPERTY)
SET(PV_TARGET_SUPPORTS_SHARED_LIBS TRUE)
ENDIF(COMMAND GET_PROPERTY)
......
PROJECT(KWCommon)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
# --------------------------------------------------------------------------
# To use this library in a larger project you will need to SUBDIR into this
......@@ -223,7 +226,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 +235,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)
......
# create a plugin that implements an object panel for a source proxy
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
PROJECT(PrismClientPlugin)
......
PROJECT (PQGUI)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
#########################################################################
# Setup Qt
......@@ -15,7 +18,10 @@ ELSE(NOT QT4_FOUND)
# can delete this check, but you are on your own.
STRING(REGEX MATCH "^4\\.2\\.[0-9]+" qt_version_tmp "${QTVERSION}")
IF (NOT qt_version_tmp)
MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.2.")
STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp2 "${QTVERSION}")
IF (NOT qt_version_tmp2)
MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.2 or 4.3.")
ENDIF (NOT qt_version_tmp2)
ENDIF (NOT qt_version_tmp)
# help CMake fine QtUiTools on Mac (binary install)
......
PROJECT(pqComponents)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
IF(PARAVIEW_ENABLE_PYTHON)
FIND_PACKAGE(PythonLibs)
......
PROJECT(pqCore)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_DIRECTORIES(
${VTK_INCLUDE_DIR}
......
PROJECT(PVServer)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
ADD_SUBDIRECTORY(Common)
ADD_SUBDIRECTORY(Filters)
......
PROJECT(PVServerCommon)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_REGULAR_EXPRESSION("^vtk.*$")
SET(KIT PVServerCommon)
......
PROJECT(PVServers)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_DIRECTORIES(
${ParaView_BINARY_DIR}
${ParaView_BINARY_DIR}/GUI/Client
......
......@@ -343,7 +343,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)
......
PROJECT(VTKCS)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
......
......@@ -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)
......
......@@ -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)
......
Xdmf2 @ 897137ae
Subproject commit 3cec971ad68e661fcdff7c5ead47b6f97c83f162
Subproject commit 897137ae7b78ea98e0360cc59827001dc4e7b4e5
CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
PROJECT(VTKHDF5 C)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
INCLUDE_REGULAR_EXPRESSION("^.*\\.[ch]$")
# EXPORT() will be in cmake 2.6, add an empty macro so older cmake versions still work
......@@ -514,7 +517,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)
......
VTK @ 6c1f1203
Subproject commit 87e5334c9f2920171b672b2b6fa2af90605f9338
Subproject commit 6c1f1203bc5414ab43d93d224cd6ddc2a6a7ebed
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