Unicode support

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

diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt
index b29c2204bc7b69b7d484a60c46789a599610ace0..c9c111fda136ecedc03d7195678698a70cd49e4d 100755 (executable)
--- a/src/GEOMBase/CMakeLists.txt
+++ b/src/GEOMBase/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -17,17 +17,16 @@
 # 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
@@ -43,7 +42,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
   )
@@ -64,6 +63,7 @@ SET(_link_LIBRARIES
 SET(GEOMBase_HEADERS
   GEOMBase.h
   GEOMBase_Skeleton.h
+  GEOMBase_DlgSkeleton.h
   GEOMBase_Helper.h
   GEOM_Operation.h
   GEOM_GEOMBase.hxx
@@ -73,12 +73,13 @@ SET(GEOMBase_HEADERS
 # header files / to be processed by moc
 SET(_moc_HEADERS
   GEOMBase_Skeleton.h
+  GEOMBase_DlgSkeleton.h
   )
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(GEOMBase_SOURCES
   GEOMBase.cxx
@@ -86,6 +87,7 @@ SET(GEOMBase_SOURCES
   GEOMBase_Helper.cxx
   GEOM_Operation.cxx
   GEOM_GenericObjPtr.cxx
+  GEOMBase_DlgSkeleton.cxx
   ${_moc_SOURCES}
   )