From e792e04e0c226a14733810d76fa3a239177e5531 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Sun, 30 Mar 2008 19:27:10 +0000 Subject: [PATCH] Final fix to boost finding on windows for cmake --- CMakeScripts/FindBoost.cmake | 9 ++++----- mingwenv.bat | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeScripts/FindBoost.cmake b/CMakeScripts/FindBoost.cmake index 99ebf81dc..ba6778ec2 100644 --- a/CMakeScripts/FindBoost.cmake +++ b/CMakeScripts/FindBoost.cmake @@ -4,13 +4,12 @@ # BOOST_INCLUDE_DIR -# To find boost on Windows, use BOOST_PATH variable set by mingwenv.bat: -SET(env_boost_path "$ENV{BOOST_PATH}") +# To find boost on Windows, use DEVLIBS_PATH variable set by mingwenv.bat FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp /usr/include /usr/local/include - env_boost_path ) + $ENV{DEVLIBS_PATH}//include ) IF (BOOST_INCLUDE_DIR) @@ -18,9 +17,9 @@ IF (BOOST_INCLUDE_DIR) ENDIF (BOOST_INCLUDE_DIR) IF (BOOST_FOUND) - MESSAGE(STATUS "Found Boost: ${BOOST_INCLUDE_DIR}") + MESSAGE(STATUS "boost: FOUND ( ${BOOST_INCLUDE_DIR} )") ELSE(BOOST_FOUND) - MESSAGE(FATAL_ERROR "Could not find Boost") + MESSAGE(FATAL_ERROR "boost: NOT FOUND") ENDIF (BOOST_FOUND) diff --git a/mingwenv.bat b/mingwenv.bat index 605e3a257..b0c5976dd 100755 --- a/mingwenv.bat +++ b/mingwenv.bat @@ -4,5 +4,5 @@ set CMAKE_BIN=c:\cmake\bin set GTK=c:/devlibs set GTKDOS=c:\devlibs set PKG_CONFIG_PATH=c:/devlibs/lib/pkgconfig -set BOOST_PATH=c:/devlibs/boost +set DEVLIBS_PATH=c:/devlibs set PATH=%MINGW_BIN%;%CMAKE_BIN%;%GTKDOS%\bin;%PATH% -- 2.30.2