From 1c3343b1f1a39650f75514699d349fe552233176 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 20 Sep 2013 04:38:21 +0000 Subject: [PATCH] Synchronize adm files --- adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake index 8398b9909..189775ef6 100644 --- a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake +++ b/adm_local_without_kernel/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() -- 2.39.2