Merge branch 'master' of newgeom:newgeom.git

diff --git a/CMakeCommon/FindBoost.cmake b/CMakeCommon/FindBoost.cmake
index e8d34a11e17aa804c42033f1ce4b5e9ec4c32744..f44122086dbba2915a1bb903e4cd7f07f2a88b6a 100644 (file)
--- a/CMakeCommon/FindBoost.cmake
+++ b/CMakeCommon/FindBoost.cmake
@@ -20,7 +20,13 @@
 #find_package(Boost)
 
 SET(BOOSTDIR $ENV{BOOST_ROOT_DIR})
-INCLUDE_DIRECTORIES(${BOOSTDIR}/include/boost-1_52)
+IF(WIN32)
+  INCLUDE_DIRECTORIES(${BOOSTDIR}/include/boost-1_52)
+ELSE(WIN32)
+  INCLUDE_DIRECTORIES(${BOOSTDIR}/include)
+ENDIF()
+
+
 LINK_DIRECTORIES (${BOOSTDIR}/lib)
 
 #SET(BOOST_LIBRARIES ${BOOSTDIR}/lib/lib.lib)