Make XAO compilation

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 36eec9b26deaa38496e03712b3f0eb8731d0a598..3c3248b778f73bb8516cf89e71944a693f82bf42 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -4,15 +4,11 @@
 IF(DEFINED ENV{LIBXML2_ROOT_DIR})
     IF(WIN32)
         FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/lib/libxml2.lib LIBXML2_LIBRARIES)
-       FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include LIBXML2_INCLUDE_DIR)
+        FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include LIBXML2_INCLUDE_DIR)
     ELSE()
         FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/lib/libxml2.so LIBXML2_LIBRARIES)
-       FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include/libxml2 LIBXML2_INCLUDE_DIR)
+        FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include/libxml2 LIBXML2_INCLUDE_DIR)
     ENDIF()
 ENDIF()
 
 FIND_PACKAGE(LibXml2 REQUIRED)
-
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-LINK_DIRECTORIES (${LIBXML2_LIBRARIES})

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1047795a7de43a940768220ac3380184e29e22f4..8e9acd5a9ce26e0621995365c2e47daac163c314 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ INCLUDE(FindPython)
 INCLUDE(FindSalome)
 INCLUDE(FindCAS)
 INCLUDE(FindSUIT)
+INCLUDE(XMLProcessing)
 
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
@@ -88,6 +89,7 @@ ADD_SUBDIRECTORY (src/ModuleBase)
 ADD_SUBDIRECTORY (src/PartSet)
 
 ADD_SUBDIRECTORY (src/XGUI)
+ADD_SUBDIRECTORY (src/XAO)
 ADD_SUBDIRECTORY (src/ExchangePlugin)
 ADD_SUBDIRECTORY (src/GeomValidators)
 ADD_SUBDIRECTORY (src/InitializationPlugin)

diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt
index 5e0123e9c57aca894ffb7004a54f2eb352a6b1e8..98f60cae96c45126ea226292acb7b22fdf0c1aff 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(Common)
-INCLUDE(XMLProcessing)
-
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
-                     ${PYTHON_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+  ${PROJECT_SOURCE_DIR}/src/Events
+  ${PYTHON_INCLUDE_DIR}
+  ${LIBXML2_INCLUDE_DIR}
+  )
 
 SET(PROJECT_HEADERS
   Config_def.h
@@ -49,18 +49,21 @@ 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)
-# -D_SCL_SECURE_NO_WARNINGS - to disable warnings 4996
+ADD_DEFINITIONS(
+  -DCONFIG_EXPORTS
+  -D_SCL_SECURE_NO_WARNINGS # to disable warnings 4996
+  ${LIBXML2_DEFINITIONS}
+  )
 
 ADD_LIBRARY(Config SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 

diff --git a/src/XAO/CMakeLists.txt b/src/XAO/CMakeLists.txt
index f1097985fabb923068fd2bad600684d506e01071..008c0c2382e88b0b963892c499b8cb08d489f116 100644 (file)
--- a/src/XAO/CMakeLists.txt
+++ b/src/XAO/CMakeLists.txt
@@ -17,9 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF(SALOME_BUILD_TESTS)
-  ADD_SUBDIRECTORY(tests)
-ENDIF(SALOME_BUILD_TESTS)
+#IF(SALOME_BUILD_TESTS)
+#  ADD_SUBDIRECTORY(tests)
+#ENDIF(SALOME_BUILD_TESTS)
 
 # --- options ---
 
@@ -46,7 +46,7 @@ SET(_link_LIBRARIES
 # --- headers ---
 
 SET(XAO_HEADERS
-  XAO.hxx 
+  XAO.hxx
   XAO_BooleanField.hxx
   XAO_BooleanStep.hxx
   XAO_BrepGeometry.hxx
@@ -91,8 +91,9 @@ SET(XAO_SOURCES
 
 # --- rules ---
 
-ADD_LIBRARY(XAO ${XAO_SOURCES})
+ADD_LIBRARY(XAO SHARED ${XAO_SOURCES})
 TARGET_LINK_LIBRARIES(XAO ${_link_LIBRARIES})
-INSTALL(TARGETS XAO EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+#INSTALL(TARGETS XAO EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+INSTALL(TARGETS XAO DESTINATION bin)
 
-INSTALL(FILES ${XAO_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+#INSTALL(FILES ${XAO_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})