Merge branch 'V7_dev'

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

diff --git a/src/PyInterp/CMakeLists.txt b/src/PyInterp/CMakeLists.txt
index 07cef33dbdfd82ec26bf5926fb1ec1075a7c2c5c..d44a73ff3063df2884840b6a91429fc93f1020ab 100755 (executable)
--- a/src/PyInterp/CMakeLists.txt
+++ b/src/PyInterp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  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
@@ -25,25 +25,24 @@ INCLUDE(UseQtExt)
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${PYTHON_INCLUDE_DIRS}
-  ${PROJECT_SOURCE_DIR}/src/Event
 )
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(${QT_DEFINITIONS} ${PYTHON_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${PYTHON_LIBRARIES} Event)
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${PYTHON_LIBRARIES})
 
 # --- headers ---
 
-# header files / to be processed by moc / internal
-# TODO: check for MSVS project
-SET(_moc_internal_HEADERS PyInterp_Watcher.h)
+# header files / to be processed by moc
+SET(_moc_HEADERS
+  PyInterp_Dispatcher.h
+)
 
 # header files / no moc processing
 SET(_other_HEADERS
   PyInterp.h
-  PyInterp_Dispatcher.h
   PyInterp_Event.h
   PyInterp_Interp.h
   PyInterp_Request.h
@@ -51,12 +50,12 @@ SET(_other_HEADERS
 )
 
 # header files / to install
-SET(PyInterp_HEADERS ${_other_HEADERS})
+SET(PyInterp_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT_WRAP_MOC(_moc_SOURCES ${_moc_internal_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES