Avoid using special object library, because some problems on WIN32 platform .

[modules/paravis.git] / src / VTKWrapping / CMakeLists.txt

diff --git a/src/VTKWrapping/CMakeLists.txt b/src/VTKWrapping/CMakeLists.txt
index 202f09eaedc38dad4883a5eb044651f54abe2259..8b2729dc957f8cf88d2ad768ae8f4ec5f34dec2d 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,26 +76,12 @@ 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})
-
-# Generate headers and sources corresponding to the IDL implementations:
-INCLUDE(wrap.cmake)
-
-## From 2.8.10, we should use:
-## SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-ADD_LIBRARY(VTK_IDL_Impl OBJECT ${WRAP_IDL_I_CC})
-# Ensure .hh files corresponding to IDL have been generated first:
-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)
+ENDFOREACH(name ${_wrap_PROGRAMS})
\ No newline at end of file