Merge from V6_main 01/04/2013

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

diff --git a/src/SOCC/CMakeLists.txt b/src/SOCC/CMakeLists.txt
index d7c6c1dd56e10ed990d0a8c6441ecff48d642565..8f1c8b72c20b0163c6d8c8424abf451782bb4d62 100755 (executable)
--- a/src/SOCC/CMakeLists.txt
+++ b/src/SOCC/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
-  ${BOOST_INCLUDE_DIRS}
+  ${QT_INCLUDES}
+  ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
@@ -30,8 +30,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
 )
 
-SET(COMMON_FLAGS "${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-SET(COMMON_LIBS ${QT_LIBS} qtx suit SalomeObject SalomePrs OCCViewer)
+SET(COMMON_LIBS ${QT_LIBRARIES} qtx suit SalomeObject SalomePrs OCCViewer)
 
 SET(GUI_HEADERS   
   SOCC_ViewModel.h
@@ -45,8 +44,9 @@ SET(SOCC_SOURCES
   SOCC_ViewWindow.cxx
 )
 
-ADD_LIBRARY(SOCC SHARED ${SOCC_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(SOCC PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
+
+ADD_LIBRARY(SOCC ${SOCC_SOURCES} ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(SOCC ${COMMON_LIBS})
 INSTALL(TARGETS SOCC DESTINATION ${GUI_salomelib_LIBS})