From: bruneton <bruneton>
Date: Thu, 19 Sep 2013 14:16:04 +0000 (+0000)
Subject: CMake: Boost include are one directory deeper under Win32
X-Git-Tag: begin_agr_portmanager_branch_131004~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=09411ef86b2b3afe71b1b5121a5ae2d103dff45d;p=modules%2Fkernel.git

CMake: Boost include are one directory deeper under Win32
---

diff --git a/salome_adm/cmake_files/FindSalomeBoost.cmake b/salome_adm/cmake_files/FindSalomeBoost.cmake
index 8398b9909..189775ef6 100644
--- a/salome_adm/cmake_files/FindSalomeBoost.cmake
+++ b/salome_adm/cmake_files/FindSalomeBoost.cmake
@@ -28,7 +28,12 @@ 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(WIN32)
+  # Under windows, one extra sub-directory in the boost installation hierarchy:
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Boost Boost_INCLUDE_DIRS 2)
+ELSE()
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Boost Boost_INCLUDE_DIRS 2)
+ENDIF()
 IF(Boost_FOUND OR BOOST_FOUND)
    MESSAGE(STATUS "Boost include dirs is: ${Boost_INCLUDE_DIRS}")
 ENDIF()