Fix compilation problem (if SALOME_BUILD_GUI=OFF)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5d476b1637bcc767ff362732261c5142c1090a0..68c9faaa1de38d53c251ab7858587d969be6cd5f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,7 +248,6 @@ IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF()
 ADD_SUBDIRECTORY(Demo)
-ADD_SUBDIRECTORY(Misc)
 
 # Header configuration
 # ====================

diff --git a/Misc/CMakeLists.txt b/Misc/CMakeLists.txt
deleted file mode 100644 (file)
index d9abdc1..0000000
--- a/Misc/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2006-2013  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#

diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt
index 06332b912206597546c378dfc842406b547d044d..c6a79766fd07073ba9bcf4eb4bf50dc2bc9ec2e7 100644 (file)
--- a/src/engine_swig/CMakeLists.txt
+++ b/src/engine_swig/CMakeLists.txt
@@ -78,12 +78,14 @@ SET(_swig_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/pypilot.py
 )
 
-ADD_CUSTOM_TARGET(docengine.i
-  COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/engine ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
-  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docengine.i
-  VERBATIM
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  )
+IF(SALOME_BUILD_DOC)
+  ADD_CUSTOM_TARGET(docengine.i
+    COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/engine ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docengine.i
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+ENDIF(SALOME_BUILD_DOC)
 
 # --- rules ---
 SET(ENGINEINCLUDES 

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index a0cc231d5eefda4a6d1dde4704e53c215e918d58..57ab977ac9c06e075db01b72948f4c68e9c1c869 100644 (file)
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -68,12 +68,14 @@ SET(_swig_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/SALOMERuntime.py
 )
 
-ADD_CUSTOM_TARGET(docruntime.i
-  COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/runtime ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
-  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docruntime.i
-  VERBATIM
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  )
+IF(SALOME_BUILD_DOC)
+  ADD_CUSTOM_TARGET(docruntime.i
+    COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/runtime ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docruntime.i
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+ENDIF(SALOME_BUILD_DOC)
 
 # --- rules ---
 SET(SWIGINCLUDES 

diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt
index b4880e802c8cfdeab531fc671acb76cf43ba166a..3ee7b76dbbf2399b436dc1e5d26ff5b226f57c72 100644 (file)
--- a/src/salomegui_swig/CMakeLists.txt
+++ b/src/salomegui_swig/CMakeLists.txt
@@ -68,13 +68,15 @@ SET(_swig_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/libYACS_Swig.py
 )
 
-ADD_CUSTOM_TARGET(doc.i
-  COMMAND DOXSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
-  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml doc.i
-  DEPENDS YACSGUI_Swig.hxx YACSGUI_Swig.cxx
-  VERBATIM
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  )
+IF(SALOME_BUILD_DOC)
+  ADD_CUSTOM_TARGET(doc.i
+    COMMAND DOXSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml doc.i
+    DEPENDS YACSGUI_Swig.hxx YACSGUI_Swig.cxx
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+ENDIF(SALOME_BUILD_DOC)
 
 # --- rules ---
 ADD_LIBRARY(YACS_Swig ${YACS_Swig_SOURCES})

diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt
index d35c2856b2b6594821a8c8268b12bd244d7618d9..1b76fc332f6a45d071ac340968e3ddfd5cca36aa 100644 (file)
--- a/src/yacsloader_swig/CMakeLists.txt
+++ b/src/yacsloader_swig/CMakeLists.txt
@@ -64,12 +64,14 @@ SET(_swig_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/loader.py
 )
 
-ADD_CUSTOM_TARGET(docyacsloader.i
-  COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/yacsloader ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
-  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docyacsloader.i
-  VERBATIM
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  )
+IF(SALOME_BUILD_DOC)
+  ADD_CUSTOM_TARGET(docyacsloader.i
+    COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/yacsloader ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docyacsloader.i
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+ENDIF(SALOME_BUILD_DOC)
 
 # --- rules ---
 SET(SWIGINCLUDES