0022077: EDF 2272 : Selection with the Paraview interaction mode in GEOM/SMESH

[modules/gui.git] / src / OCCViewer / CMakeLists.txt

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index 04f406477635cc4cd459f2099103e02066bd0bea..c4ea709b7b7c844566d98a40a0ed6b728b098ee5 100755 (executable)
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -25,7 +25,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${OGL_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
+  ${QT_INCLUDES}
   ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
@@ -34,14 +34,16 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../OpenGLUtils
   ${CMAKE_CURRENT_SOURCE_DIR}/../CASCatch
 )
-SET(COMMON_FLAGS "${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+
+
+
 SET(COMMON_LIBS
   qtx
   suit
   ViewerTools
   OpenGLUtils
-  ${OGL_LIBS}
-  ${QT_MT_LIBS}
+  ${OPENGL_LIBRARIES}
+  ${QT_LIBRARIES}
   ${CAS_KERNEL}
   ${CAS_VIEWER}
 )
@@ -91,8 +93,9 @@ SET(GUITS_SOURCES
   resources/OCCViewer_msg_fr.ts
 )
 
-ADD_LIBRARY(OCCViewer SHARED ${OCCViewer_SOURCES} ${GUI_HEADERS})
-SET_TARGET_PROPERTIES(OCCViewer PROPERTIES COMPILE_FLAGS ${COMMON_FLAGS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
+
+ADD_LIBRARY(OCCViewer ${OCCViewer_SOURCES} ${GUI_HEADERS})
 TARGET_LINK_LIBRARIES(OCCViewer ${COMMON_LIBS})
 INSTALL(TARGETS OCCViewer DESTINATION ${GUI_salomelib_LIBS})
 SET(COMMON_HEADERS_H