Fixes for compilation

diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt
index 98f60cae96c45126ea226292acb7b22fdf0c1aff..5e0123e9c57aca894ffb7004a54f2eb352a6b1e8 100644 (file)
--- a/src/Config/CMakeLists.txt
+++ b/src/Config/CMakeLists.txt
@@ -1,10 +1,10 @@
 ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-INCLUDE_DIRECTORIES(
-  ${PROJECT_SOURCE_DIR}/src/Events
-  ${PYTHON_INCLUDE_DIR}
-  ${LIBXML2_INCLUDE_DIR}
-  )
+INCLUDE(Common)
+INCLUDE(XMLProcessing)
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
+                     ${PYTHON_INCLUDE_DIR})
 
 SET(PROJECT_HEADERS
   Config_def.h
@@ -49,21 +49,18 @@ SET(PROJECT_SOURCES
 SET(XML_RESOURCES
   ${CMAKE_CURRENT_BINARY_DIR}/plugins.xml
   dataModel.xml
-  )
+)
 
 SET(PROJECT_LIBRARIES
-  Events
-  ${LIBXML2_LIBRARIES}
-  ${PYTHON_LIBRARIES}
-  )
+    Events
+    ${LIBXML2_LIBRARIES}
+    ${PYTHON_LIBRARIES}
+)
 
-SOURCE_GROUP("Resource Files" FILES ${XML_RESOURCES})
+SOURCE_GROUP ("Resource Files" FILES ${XML_RESOURCES})
 
-ADD_DEFINITIONS(
-  -DCONFIG_EXPORTS
-  -D_SCL_SECURE_NO_WARNINGS # to disable warnings 4996
-  ${LIBXML2_DEFINITIONS}
-  )
+ADD_DEFINITIONS(-DCONFIG_EXPORTS -D_SCL_SECURE_NO_WARNINGS)
+# -D_SCL_SECURE_NO_WARNINGS - to disable warnings 4996
 
 ADD_LIBRARY(Config SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 

diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
index e0505cc9aff093519952c06241c9235b34d13ae2..81c62671d95e8ffb77f6ba63cee5a25ea0c840c7 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
@@ -64,7 +64,7 @@ void ExchangePlugin_ExportFeature::initAttributes()
 
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::SELECTION_LIST_ID());
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_AUTHOR_ID());
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID());
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID());
 }
 
 /*

diff --git a/src/XAO/CMakeLists.txt b/src/XAO/CMakeLists.txt
index 008c0c2382e88b0b963892c499b8cb08d489f116..a370f570cf983c12c05468662b2e47f10595ad45 100644 (file)
--- a/src/XAO/CMakeLists.txt
+++ b/src/XAO/CMakeLists.txt
@@ -23,18 +23,27 @@
 
 # --- options ---
 
+INCLUDE(Common)
+INCLUDE(XMLProcessing)
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
+                     ${PYTHON_INCLUDE_DIR}
+                     ${CAS_INCLUDE_DIRS})
+
 # additional include directories
-INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIR}
-  ${LIBXML2_INCLUDE_DIR}
-  ${CAS_INCLUDE_DIRS}
-  )
+#INCLUDE_DIRECTORIES(
+#  ${PTHREAD_INCLUDE_DIR}
+#  ${LIBXML2_INCLUDE_DIR}
+#  ${CAS_INCLUDE_DIRS}
+#  )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(
-  ${LIBXML2_DEFINITIONS} 
-  ${CAS_DEFINITIONS}
-  )
+#ADD_DEFINITIONS(
+#  ${LIBXML2_DEFINITIONS} 
+#  ${CAS_DEFINITIONS}
+#  )
+ADD_DEFINITIONS(${CAS_DEFINITIONS})
+
 
 # libraries to link to
 SET(_link_LIBRARIES
@@ -43,6 +52,12 @@ SET(_link_LIBRARIES
   ${CAS_TKBRep} ${CAS_TKTopAlgo} ${CAS_TKG2d}
   )
 
+SET(PROJECT_LIBRARIES
+    ${LIBXML2_LIBRARIES}
+    ${PYTHON_LIBRARIES}
+)
+
+
 # --- headers ---
 
 SET(XAO_HEADERS