From: bruneton <bruneton>
Date: Mon, 22 Jul 2013 13:56:17 +0000 (+0000)
Subject: CMake: FindSalomeBoost.cmake was missing for a STANDALONE compile + FindSalomeMEDFile... 
X-Git-Tag: B4PolyhIntersect~66
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0c8719a2a71417cb33abc05270ea24513f205a9f;p=modules%2Fmed.git

CMake: FindSalomeBoost.cmake was missing for a STANDALONE compile + FindSalomeMEDFile.cmake
was still refering to an invalid reference variable + doc of FindMEDFile.cmake
---

diff --git a/adm_local_without_kernel/cmake_files/FindMEDFile.cmake b/adm_local_without_kernel/cmake_files/FindMEDFile.cmake
index 1d1d4c865..19f5746ad 100644
--- a/adm_local_without_kernel/cmake_files/FindMEDFile.cmake
+++ b/adm_local_without_kernel/cmake_files/FindMEDFile.cmake
@@ -1,3 +1,15 @@
+# - Find MED file installation
+#
+# The following variable are set:
+#   MEDFILE_INCLUDE_DIRS
+#   MEDFILE_LIBRARIES
+#   MEDFILE_C_LIBRARIES
+#   MEDFILE_F_LIBRARIES
+#
+#  The CMake (or environment) variable MEDFILE_ROOT_DIR can be set to
+#  guide the detection and indicate a root directory to look into.
+#
+############################################################################
 # Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
diff --git a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake
new file mode 100644
index 000000000..8398b9909
--- /dev/null
+++ b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake
@@ -0,0 +1,40 @@
+# Copyright (C) 2013  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
+# 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
+#
+# Author: Adrien Bruneton
+#
+
+# Boost detection dor Salome
+#
+#  !! Please read the generic detection procedure in SalomeMacros.cmake !!
+#
+SET(Boost_USE_STATIC_LIBS        OFF)
+SET(Boost_USE_MULTITHREADED      ON )
+SET(Boost_USE_STATIC_RUNTIME     OFF)
+SET(Boost_NO_BOOST_CMAKE         ON)
+
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Boost Boost_INCLUDE_DIRS 1)
+IF(Boost_FOUND OR BOOST_FOUND)
+   MESSAGE(STATUS "Boost include dirs is: ${Boost_INCLUDE_DIRS}")
+ENDIF()   
+#MARK_AS_ADVANCED()
+
+## Specific definitions:
+IF(WIN32)
+  SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS)
+ENDIF()
diff --git a/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake b/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake
index f890f17a9..a44420836 100644
--- a/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake
@@ -24,5 +24,5 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_ROOT_DIR_EXP 0)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()