Some corrections of import/export operations

[plugins/dxfplugin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6a6cabd96560ad1661e8314b2fd8b2a9f8d3d97..14ef9653edc8a1aeff8039b72a1cebd94697a860 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,6 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${DXF_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
-  ${GUI_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
   )
@@ -37,6 +36,8 @@ INCLUDE_DIRECTORIES(
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
     ${QT_INCLUDE_DIRS}
+    ${GUI_INCLUDE_DIRS}
+    ${GEOM_INCLUDE_DIRS}
     )
 ENDIF()
 
@@ -52,7 +53,7 @@ ADD_DEFINITIONS(
 ENDIF()
 
 # libraries to link to
-SET(_link_LIBRARIES
+SET(_link_engine_LIBRARIES
   ${CAS_TKXSBase}
   ${DXF_LIBRARIES}
   ${KERNEL_SALOMEBasics}
@@ -66,8 +67,10 @@ SET(_link_LIBRARIES
   )
   
 IF(SALOME_BUILD_GUI)
-  SET(_link_LIBRARIES
-    ${_link_LIBRARIES}
+  SET(_link_gui_LIBRARIES
+    SalomeIDLDXFPlugin
+    ${GEOM_GEOMObject}
+    ${GEOM_GEOMBase}
     ${GEOM_GEOMBase}
     )
 ENDIF()
@@ -76,9 +79,9 @@ ENDIF()
 # --- headers ---
 
 SET(DXFPluginEngine_HEADERS
-  DXFPlugin_Operations_i.hh
+  DXFPlugin_IOperations_i.hh
   DXFPlugin_Engine.hxx
-  DXFPlugin_OperationsCreator.hh
+  DXFPlugin_OperationsCreator.hxx
   DXFPlugin_IOperations.hxx
   DXFPlugin_IExport.hxx 
   DXFPlugin_IImport.hxx
@@ -90,8 +93,7 @@ SET(DXFPluginEngine_HEADERS
 IF(SALOME_BUILD_GUI)  
   # header files / to be processed by moc
   SET(_moc_HEADERS
-    DXFPlugin_ExportDlg.h
-    DXFPlugin_ImportDlg.h
+    DXFPlugin_GUI.h
     )
 ENDIF()
 
@@ -102,17 +104,15 @@ IF(SALOME_BUILD_GUI)
   QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
 
   SET(DXFPluginGUI_SOURCES
-    DXFPluginGUI.cxx
-    DXFPlugin_ExportDlg.cxx
-    DXFPlugin_ImportDlg.cxx
+    DXFPlugin_GUI.cxx
     ${_moc_SOURCES}
     )
 ENDIF()
   
 SET(DXFPluginEngine_SOURCES
-  DXFPluginEngine.cxx
-  DXFPlugin_OperationsCreator.cc
-  DXFPlugin_Operations_i.cc
+  DXFPlugin_Engine.cxx
+  DXFPlugin_OperationsCreator.cxx
+  DXFPlugin_IOperations_i.cc
   DXFPlugin_IOperations.cxx
   DXFPlugin_ExportDriver.cxx
   DXFPlugin_ImportDriver.cxx
@@ -136,13 +136,13 @@ SET(_python_DXF_SCRIPTS
 
 # install Engine library
 ADD_LIBRARY(DXFPluginEngine ${DXFPluginEngine_SOURCES})
-TARGET_LINK_LIBRARIES(DXFPluginEngine ${_link_LIBRARIES})
+TARGET_LINK_LIBRARIES(DXFPluginEngine ${_link_engine_LIBRARIES})
 INSTALL(TARGETS DXFPluginEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 # install GUI library
 IF(SALOME_BUILD_GUI)
   ADD_LIBRARY(DXFPluginGUI ${DXFPluginGUI_SOURCES})
-  TARGET_LINK_LIBRARIES(DXFPluginGUI ${_link_LIBRARIES})
+  TARGET_LINK_LIBRARIES(DXFPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS DXFPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   # install resources
   QT4_INSTALL_TS_RESOURCES("${DXFPlugin_RESOURCES}" "${SALOME_DXFPLUGIN_INSTALL_RES_DATA}")