diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-03-30 19:07:47 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-03-30 19:07:47 +0000 |
| commit | 639b35ba2ce59b58cbc03020a6f3bef0d83aaa95 (patch) | |
| tree | 443fae2913d7fae7679c3f348c3e539e741d6571 /CMakeScripts | |
| parent | add boost path to mingwenv.bat (diff) | |
| download | inkscape-639b35ba2ce59b58cbc03020a6f3bef0d83aaa95.tar.gz inkscape-639b35ba2ce59b58cbc03020a6f3bef0d83aaa95.zip | |
fix finding boost for windows.
(bzr r5253)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/FindBoost.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/CMakeScripts/FindBoost.cmake b/CMakeScripts/FindBoost.cmake index 68f178b61..e743d3310 100644 --- a/CMakeScripts/FindBoost.cmake +++ b/CMakeScripts/FindBoost.cmake @@ -3,15 +3,18 @@ # Defines: # BOOST_INCLUDE + +# To find boost on Windows, use BOOST_PATH variable set by mingwenv.bat: +SET(env_boost_path "$ENV{BOOST_PATH}") + FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp /usr/include /usr/local/include - C:\\Boost\\Include - C:\\Boost\\include\\boost-1_33_1 ) + env_boost_path ) IF(MINGW) - SET (BOOST_ROOT C:\\Boost) + SET (BOOST_ROOT env_boost_path) FIND_LIBRARY( BOOST_PYTHON_LIBRARY libboost_python-mgw PATHS ${BOOST_ROOT}\\lib ) @@ -20,9 +23,9 @@ IF(MINGW) PATHS ${BOOST_ROOT}\\lib ) ELSE(MINGW) FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES boost_python - PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) + PATHS /usr/lib /usr/local/lib ${BOOST_ROOT}\\lib ) FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES boost_python-d - PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) + PATHS /usr/lib /usr/local/lib ${BOOST_ROOT}\\lib ) ENDIF(MINGW) IF (BOOST_INCLUDE_DIR) |