Fix compilation error (conflict of OK name between OCCT Plate_Plate.hxx and GEOM...

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

diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 57ec76c..fcbcd4b
--- a/src/GenerationGUI/CMakeLists.txt
+++ b/src/GenerationGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2024  CEA, EDF, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,17 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
@@ -37,6 +35,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/GEOMImpl
   ${PROJECT_SOURCE_DIR}/src/GEOMGUI
   ${PROJECT_SOURCE_DIR}/src/GEOMBase
+  ${PROJECT_SOURCE_DIR}/src/GEOMUtils
   ${PROJECT_SOURCE_DIR}/src/DlgRef
   ${PROJECT_BINARY_DIR}/src/DlgRef
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -44,17 +43,22 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
   )
 
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
 # libraries to link to
 SET(_link_LIBRARIES
   GEOMObject
   GEOMClient
   GEOMImpl
   GEOMBase
+  GEOMUtils
   GEOM
   DlgRef
   )
@@ -68,6 +72,7 @@ SET(GenerationGUI_HEADERS
   GenerationGUI_FillingDlg.h
   GenerationGUI_PipeDlg.h
   GenerationGUI_PipePathDlg.h
+  GenerationGUI_ThicknessDlg.h
   )
 
 # header files / to be processed by moc
@@ -77,12 +82,13 @@ SET(_moc_HEADERS
   GenerationGUI_FillingDlg.h
   GenerationGUI_PipeDlg.h
   GenerationGUI_PipePathDlg.h
+  GenerationGUI_ThicknessDlg.h
   )
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(GenerationGUI_SOURCES
   GenerationGUI.cxx
@@ -91,6 +97,7 @@ SET(GenerationGUI_SOURCES
   GenerationGUI_FillingDlg.cxx
   GenerationGUI_PipeDlg.cxx
   GenerationGUI_PipePathDlg.cxx
+  GenerationGUI_ThicknessDlg.cxx
   ${_moc_SOURCES}
   )