]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
CMake: Boost include are one directory deeper under Win32
authorbruneton <bruneton>
Thu, 19 Sep 2013 14:16:04 +0000 (14:16 +0000)
committerbruneton <bruneton>
Thu, 19 Sep 2013 14:16:04 +0000 (14:16 +0000)
salome_adm/cmake_files/FindSalomeBoost.cmake

index 8398b9909a2007a5cafc38a99b8003e33243c5f4..189775ef6240149ac100d27310665bf5d8a70100 100644 (file)
@@ -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()