Merge relevant changes from V8_0_0_BR branch

[modules/geom.git] / src / XAOPlugin / CMakeLists.txt

diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt
index 7d24c4345c6d530456c098b8f5c5611eeb1e9e6d..6634a1ac8c52a9b919b612f97e4274a10233e0d9 100644 (file)
--- a/src/XAOPlugin/CMakeLists.txt
+++ b/src/XAOPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015  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,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---
@@ -52,8 +51,13 @@ ENDIF()
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${CAS_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
   )
   
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
 IF(SALOME_BUILD_GUI)
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}