Hello,
as I am just working with some boost headers that do reside in a
different include directory, I would like to ask to apply the appended
patch.
It will not only find versions where headers are in
prefix/include/boost/boost_1_34 (which is currently the default for
windows) but also prefix/include/boost/boost-1_34 (as it is currently on
non-Win32 platforms).
The patch would only lead to unwanted effects if somebody is using the
difference between win32 and non-win32 versions currently (e.g. he has
boost-1_34 and boost_1_34 in the same directory). As this seems to
strange to be used, I'd think the patch is safe enough to be applied.
regards,
Patrick
--
web: http://windows.kde.org
mailing list: kde-wind...@kde.org
irc: #kde-windows (irc.freenode.net)
--- tmp\cmake-2.6.2\work\cmake-2.6.2-win32-x86\share\cmake-2.6\Modules\FindBoost.cmake 2008-12-12 00:58:54.281250000 +0100
+++ share\cmake-2.6\Modules\FindBoost.cmake 2008-12-12 01:00:17.343750000 +0100
@@ -293,20 +293,17 @@
# Add in a path suffix, based on the required version, ideally
# we could read this from version.hpp, but for that to work we'd
# need to know the include dir already
- if (WIN32 AND NOT CYGWIN)
- set(_boost_PATH_SUFFIX boost_${_boost_VER})
- else (WIN32 AND NOT CYGWIN)
- set(_boost_PATH_SUFFIX boost-${_boost_VER})
- endif (WIN32 AND NOT CYGWIN)
+ set(_boost_VERSION ${_boost_VER})
- IF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+ IF(_boost_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
- ELSEIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+")
+ _boost_VERSION ${_boost_VERSION})
+ ELSEIF(_boost_VERSION MATCHES "[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
- ENDIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- LIST(APPEND _boost_PATH_SUFFIXES "${_boost_PATH_SUFFIX}")
+ _boost_VERSION ${_boost_VERSION})
+ ENDIF(_boost_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+ LIST(APPEND _boost_PATH_SUFFIXES "boost_${_boost_VERSION}")
+ LIST(APPEND _boost_PATH_SUFFIXES "boost-${_boost_VERSION}")
ENDFOREACH(_boost_VER)
# Look for a standard boost header file.
_______________________________________________
CMake mailing list
CMake@cmake.org
http://www.cmake.org/mailman/listinfo/cmake
