From 8b3c863df49b1411b4db4be153611542d0235d13 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 7 Nov 2013 13:08:05 +0000 Subject: [PATCH] Building ParaVis SALOME module om win32 platform. --- CMakeLists.txt | 4 ++-- idl/CMakeLists.txt | 2 +- idl/wrap.cmake | 8 ++++---- src/PVGUI/CMakeLists.txt | 2 +- src/Plugins/MedReader/CMake/FindMED.cmake | 6 +++--- src/Plugins/ParaMEDCorba/CMakeLists.txt | 2 +- src/Plugins/TableReader/Reader/CMakeLists.txt | 2 +- src/VTKWrapping/CMakeLists.txt | 8 +++++--- src/VTKWrapping/wrap.cmake | 8 ++++---- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7ee3751..ab6a18c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,10 +19,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) PROJECT(SalomePARAVIS C CXX) -IF(WINDOWS) +IF(WIN32) STRING( REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ) SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG "${replacementFlags}" ) -ENDIF(WINDOWS) +ENDIF(WIN32) # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 6ea44df2..22d2e6da 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -35,7 +35,7 @@ IF(NOT SALOME_PARAVIS_MINIMAL_CORBA) SET(OMNIORB_IDLPYFLAGS "${OMNIORB_IDLPYFLAGS};-DPARAVIS_WITH_FULL_CORBA") ADD_DEFINITIONS(-DPARAVIS_WITH_FULL_CORBA) ENDIF() - + ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) SET(SalomeIDLPARAVIS_IDLSOURCES PARAVIS_Gen.idl PARAVIS_Gen_Types.idl diff --git a/idl/wrap.cmake b/idl/wrap.cmake index 401463f4..bdff1c96 100755 --- a/idl/wrap.cmake +++ b/idl/wrap.cmake @@ -63,13 +63,13 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt) LIST(APPEND WRAP_IDL PARAVIS_Gen_${VAL}.idl) #SET(WRAP_SK_FILES ${WRAP_SK_FILES} PARAVIS_Gen_${VAL}SK.cc) SET(vtkWrapIDL_EXEFILE ${PROJECT_BINARY_DIR}/src/VTKWrapping/vtkWrapIDL) - IF(WINDOWS) + IF(WIN32) IF(CMAKE_BUILD_TOOL STREQUAL nmake) - SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL.exe) + SET(vtkWrapIDL_EXEFILE ${PROJECT_BINARY_DIR}/src/VTKWrapping/vtkWrapIDL.exe) ELSE(CMAKE_BUILD_TOOL STREQUAL nmake) - SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL.exe) + SET(vtkWrapIDL_EXEFILE ${PROJECT_BINARY_DIR}/src/VTKWrapping/${CMAKE_BUILD_TYPE}/vtkWrapIDL.exe) ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake) - ENDIF(WINDOWS) + ENDIF(WIN32) ADD_CUSTOM_COMMAND( OUTPUT PARAVIS_Gen_${VAL}.idl COMMAND ${vtkWrapIDL_EXEFILE} -o PARAVIS_Gen_${VAL}.idl --hints hints ${PARAVIEW_INCLUDE_DIR0}/${VAL}.h diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt index 5c2bce2a..566015aa 100644 --- a/src/PVGUI/CMakeLists.txt +++ b/src/PVGUI/CMakeLists.txt @@ -44,7 +44,7 @@ SET(_PARAVIEW_APP_COMPO_LIB SET(_link_LIBRARIES ${OMNIORB_LIBRARIES} - ${QT_LIBS} + ${QT_LIBRARIES} ${CAS_KERNEL} ${PYTHON_LIBS} ${KERNEL_LDFLAGS} ${KERNEL_SalomeDS} ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeIDLKernel} diff --git a/src/Plugins/MedReader/CMake/FindMED.cmake b/src/Plugins/MedReader/CMake/FindMED.cmake index aaae14cf..eb6abe07 100644 --- a/src/Plugins/MedReader/CMake/FindMED.cmake +++ b/src/Plugins/MedReader/CMake/FindMED.cmake @@ -78,10 +78,10 @@ IF(MED_INCLUDE_DIR) ENDIF(MED_INCLUDE_DIR) IF(${MED_FOUND}) - IF(WINDOWS) + IF(WIN32) SET(MED_LIBRARIES ${MED_LIBRARIES} ${HDF5_LIBS}) SET(MED_INCLUDE_DIRS ${MED_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}) - ELSE(WINDOWS) + ELSE(WIN32) FIND_PACKAGE(SalomeHDF5 REQUIRED) SET(MED_LIBRARIES ${MED_LIBRARIES} ${HDF5_LIBRARIES}) SET(MED_INCLUDE_DIRS ${MED_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS}) @@ -90,7 +90,7 @@ IF(${MED_FOUND}) SET(MED_LIBRARIES ${MED_LIBRARIES} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY}) SET(MED_INCLUDE_DIRS ${MED_INCLUDE_DIRS} ${MPI_INCLUDE_PATH}) ENDIF(${HDF5_IS_PARALLEL}) - ENDIF(WINDOWS) + ENDIF(WIN32) ENDIF(${MED_FOUND}) SET(MED_INCLUDE_DIR ${MED_INCLUDE_DIRS}) diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt index 7ab3d5d8..35a53b37 100644 --- a/src/Plugins/ParaMEDCorba/CMakeLists.txt +++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt @@ -63,7 +63,7 @@ PROJECT( ParaMEDCorba ) ${OMNIORB_LIBRARIES} ${MED_SalomeIDLMED} ${KERNEL_SalomeIDLKernel} - ${QT_LIBS} + ${QT_LIBRARIES} ) TARGET_LINK_LIBRARIES(ParaMEDCorbaPlugin ParaMEDMEM2VTK diff --git a/src/Plugins/TableReader/Reader/CMakeLists.txt b/src/Plugins/TableReader/Reader/CMakeLists.txt index b03e0a66..320c06aa 100644 --- a/src/Plugins/TableReader/Reader/CMakeLists.txt +++ b/src/Plugins/TableReader/Reader/CMakeLists.txt @@ -24,7 +24,7 @@ SET(READER_SRCS ADD_LIBRARY(vtkVisuTableReader ${READER_SRCS}) -TARGET_LINK_LIBRARIES(vtkVisuTableReader ${VTK_LIBRARIES} ${vtkInfovis} ${QT_LIBS}) +TARGET_LINK_LIBRARIES(vtkVisuTableReader ${VTK_LIBRARIES} ${vtkInfovis} ${QT_LIBRARIES}) INSTALL( TARGETS vtkVisuTableReader diff --git a/src/VTKWrapping/CMakeLists.txt b/src/VTKWrapping/CMakeLists.txt index 202f09ea..254f08c8 100644 --- a/src/VTKWrapping/CMakeLists.txt +++ b/src/VTKWrapping/CMakeLists.txt @@ -48,6 +48,8 @@ SET(vtkWrapIDL_CPPFLAGS) # ADD_DEFINITIONS(-DVTK_PARSE_LEGACY_REMOVE) #ENDIF() +ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) + FOREACH(name ${_wrap_PROGRAMS}) ADD_EXECUTABLE(${name} ParaView/vtkParse.tab.c @@ -74,13 +76,13 @@ FOREACH(name ${_wrap_PROGRAMS}) TARGET_LINK_LIBRARIES(${name} ${PLATFORM_LIBADD}) SET(${name}_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${name}) - IF(WINDOWS) + IF(WIN32) IF(CMAKE_BUILD_TOOL STREQUAL nmake) SET(${name}_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${name}.exe) ELSE(CMAKE_BUILD_TOOL STREQUAL nmake) SET(${name}_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${name}.exe) ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake) - ENDIF(WINDOWS) + ENDIF(WIN32) INSTALL(FILES ${${name}_EXEFILE} DESTINATION bin/salome PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDFOREACH(name ${_wrap_PROGRAMS}) @@ -96,4 +98,4 @@ ADD_DEPENDENCIES(VTK_IDL_Impl omniorb_module_SalomeIDLPARAVIS) # Make the list of wrapped files visible from the top directory (will be used in PVGUI and idl): SET(WRAP_IDL_I_HH "${WRAP_IDL_I_HH}" PARENT_SCOPE) -SET(WRAP_IDL_I_CC "${WRAP_IDL_I_CC}" PARENT_SCOPE) +SET(WRAP_IDL_I_CC "${WRAP_IDL_I_CC}" PARENT_SCOPE) \ No newline at end of file diff --git a/src/VTKWrapping/wrap.cmake b/src/VTKWrapping/wrap.cmake index daf5d126..adcd1581 100755 --- a/src/VTKWrapping/wrap.cmake +++ b/src/VTKWrapping/wrap.cmake @@ -53,13 +53,13 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt) LIST(APPEND WRAP_IDL_I_CC PARAVIS_Gen_${VAL}_i.cc) SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_HH) - IF(WINDOWS) + IF(WIN32) IF(CMAKE_BUILD_TOOL STREQUAL nmake) SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_HH.exe) ELSE(CMAKE_BUILD_TOOL STREQUAL nmake) SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL_HH.exe) ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake) - ENDIF(WINDOWS) + ENDIF(WIN32) ADD_CUSTOM_COMMAND( OUTPUT PARAVIS_Gen_${VAL}_i.hh @@ -68,13 +68,13 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt) ) SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_CC) - IF(WINDOWS) + IF(WIN32) IF(CMAKE_BUILD_TOOL STREQUAL nmake) SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_CC.exe) ELSE(CMAKE_BUILD_TOOL STREQUAL nmake) SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL_CC.exe) ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake) - ENDIF(WINDOWS) + ENDIF(WIN32) ADD_CUSTOM_COMMAND( OUTPUT PARAVIS_Gen_${VAL}_i.cc -- 2.39.2