Building ParaVis SALOME module om win32 platform.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7ee3751959982fc3f580ac07598fd2d6ca37a49..ab6a18c887c9486a8f34969219a34d7976729a10 100644 (file)
--- 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 6ea44df26d8b083ad8a3d28859fad9dcb0bded72..22d2e6dac7dc2215ce1fc30f73e3ec85fa656298 100644 (file)
--- 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 401463f49c1c66e173aa473f3933e5a1a890aef9..bdff1c96937395ef2f4759595ccb1f6c0074d390 100755 (executable)
--- 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 5c2bce2a9a2bb1f3715b854503941c50b9e18fd6..566015aae49b2d10d89b94f20e98efcb40e460d3 100644 (file)
--- 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 aaae14cfeb2ecd75f22f4fc53388dd8236e3ad51..eb6abe07e8f93fd374210ffa83124c1b395a8082 100644 (file)
--- 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 7ab3d5d8b19ddbfe46429c2aebb315b1d7369070..35a53b3772906e238d044769f5980bae7c6d9561 100644 (file)
--- 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 b03e0a66c446ab2d270fe345cacb7e29cd032be1..320c06aaa90118541a1deb6709fc570309bc0515 100644 (file)
--- 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 202f09eaedc38dad4883a5eb044651f54abe2259..254f08c8a475f89230191932ef94b4456ae25d23 100644 (file)
--- 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 daf5d126ae011833d48b87e295b8851d9d802b5c..adcd1581e243bb41f01c23dfbe51e1957b35e626 100755 (executable)
--- 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