Hi, Philippe why did you remove the documentation?
-- andreas
[EMAIL PROTECTED] wrote:
> Please, do not reply to this mailing list, use wengophone-devel instead.
>
>
> ------------------------------------------------------------------------
>
> Author: pbernery
> Date: 2007-08-23 11:31:59 +0200 (Thu, 23 Aug 2007)
> New Revision: 12365
>
> Modified:
> owbuild/branches/wengophone-2.2/owbuild/FindBoost.cmake
> Log:
> * (buildfix) compilation fix for Mac OS X
>
> Modified: owbuild/branches/wengophone-2.2/owbuild/FindBoost.cmake
> ===================================================================
> --- owbuild/branches/wengophone-2.2/owbuild/FindBoost.cmake 2007-08-22
> 15:22:16 UTC (rev 12364)
> +++ owbuild/branches/wengophone-2.2/owbuild/FindBoost.cmake 2007-08-23
> 09:31:59 UTC (rev 12365)
> @@ -8,34 +8,6 @@
> # BOOST_DEFINITIONS - Compiler switches required for using Boost
> # BOOST_LIBRARIES_SUFFIX - Boost libraries name suffix (e.g
> -vc71-mt-gd-1_34, -gcc41-mt...)
> #
> -# BOOST_DATE_TIME_FOUND True if Boost Date Time was found.
> -# BOOST_FILESYSTEM_FOUND True if Boost Filesystem was found.
> -# BOOST_IOSTREAMS_FOUND True if Boost Iostream was found.
> -# BOOST_PRG_EXEC_MONITOR_FOUND True if Boost Program Exec Monitor
> was found.
> -# BOOST_PROGRAM_OPTIONS_FOUND True if Boost Program Options was
> found.
> -# BOOST_PYTHON_FOUND True if Boost Python was found.
> -# BOOST_REGEX_FOUND True if Boost Regex was found.
> -# BOOST_SERIALIZATION_FOUND True if Boost Serialization was found.
> -# BOOST_SIGNALS_FOUND True if Boost Signals was found.
> -# BOOST_TEST_EXEC_MONITOR_FOUND True if Boost Test Exec Monitor was
> found.
> -# BOOST_THREAD-MT_FOUND True if Boost Thread was found.
> -# BOOST_UNIT_TEST_FRAMEWORK_FOUND True if Boost Unit Test Framework was
> found.
> -# BOOST_WSERIALIZATION_FOUND True if Boost WSerialization was
> found.
> -#
> -# BOOST_DATE_TIME_LIBRARY The Boost Date Time libary.
> -# BOOST_FILESYSTEM_LIBRARY The Boost Filesystem libary.
> -# BOOST_IOSTREAMS_LIBRARY The Boost Iostream libary.
> -# BOOST_PRG_EXEC_MONITOR_LIBRARY The Boost Program libary.
> -# BOOST_PROGRAM_OPTIONS_LIBRARY The Boost Program libary.
> -# BOOST_PYTHON_LIBRARY The Boost Python libary.
> -# BOOST_REGEX_LIBRARY The Boost Regex libary.
> -# BOOST_SERIALIZATION_LIBRARY The Boost Serialization libary.
> -# BOOST_SIGNALS_LIBRARY The Boost Signals libary.
> -# BOOST_TEST_EXEC_MONITOR_LIBRARY The Boost Test Exec Monitor libary.
> -# BOOST_THREAD_LIBRARY The Boost Thread libary.
> -# BOOST_UNIT_TEST_FRAMEWORK_LIBRARY The Boost Unit Test Framework libary.
> -# BOOST_WSERIALIZATION_LIBRARY The Boost WSerialization libary.
> -#
> # Copyright (c) 2006 Andreas Schneider <[EMAIL PROTECTED]>
> # Copyright (c) 2007 Wengo
> #
> @@ -170,6 +142,16 @@
> ${BOOST_PATH_SUFFIX}
> )
>
> + if (APPLE)
> + # CMake bug on Mac OS X:
> + # When include path has been found in a .framework,
> + # BOOST_INCLUDE_DIR is path_to_boost_inc_dir/boost
> + # where it should be path_to_boost_inc_dir.
> + # This code removes the trailing boost if needed.
> + if (NOT EXISTS ${BOOST_INCLUDE_DIR}/boost/config.hpp)
> + get_filename_component(BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR} PATH)
> + endif (NOT EXISTS ${BOOST_INCLUDE_DIR}/boost/config.hpp)
> + endif (APPLE)
>
> foreach (TMP_BOOST_LIBRARIES_SUFFIX "" ${BOOST_LIBRARIES_SUFFIXES})
>
> @@ -266,14 +248,10 @@
> endif (NOT BOOST_SIGNALS_LIBRARY)
>
> if (NOT BOOST_TEST_EXEC_MONITOR_LIBRARY)
> - if (WIN32)
> - set (_name libboost_test_exec_monitor${TMP_BOOST_LIBRARIES_SUFFIX})
> - else (WIN32)
> - set (_name boost_test_exec_monitor${TMP_BOOST_LIBRARIES_SUFFIX})
> - endif (WIN32)
> find_library(BOOST_TEST_EXEC_MONITOR_LIBRARY
> NAMES
> - ${_name}
> + boost_test_exec_monitor${TMP_BOOST_LIBRARIES_SUFFIX}
> + libboost_test_exec_monitor${TMP_BOOST_LIBRARIES_SUFFIX}
> PATHS
> ${BOOST_LIBRARIES_SEARCH_DIRS}
> )
> @@ -290,15 +268,10 @@
> endif (NOT BOOST_THREAD_LIBRARY)
>
> if (NOT BOOST_UNIT_TEST_FRAMEWORK_LIBRARY)
> - set (_boost_unit_test_lib_name "")
> - if (WIN32)
> - set (_boost_unit_test_lib_name
> libboost_unit_test_framework${TMP_BOOST_LIBRARIES_SUFFIX})
> - else (WIN32)
> - set (_boost_unit_test_lib_name
> boost_unit_test_framework${TMP_BOOST_LIBRARIES_SUFFIX})
> - endif (WIN32)
> find_library(BOOST_UNIT_TEST_FRAMEWORK_LIBRARY
> NAMES
> - ${_boost_unit_test_lib_name}
> + boost_unit_test_framework${TMP_BOOST_LIBRARIES_SUFFIX}
> + libboost_unit_test_framework${TMP_BOOST_LIBRARIES_SUFFIX}
> PATHS
> ${BOOST_LIBRARIES_SEARCH_DIRS}
> )
> @@ -444,7 +417,7 @@
>
> if (BOOST_FOUND)
> if (NOT Boost_FIND_QUIETLY)
> - message(STATUS "Found Boost: ${BOOST_LIBRARIES}")
> + message(STATUS "Found Boost: ${BOOST_INCLUDE_DIRS},
> ${BOOST_LIBRARIES}")
> endif (NOT Boost_FIND_QUIETLY)
> else (BOOST_FOUND)
> if (Boost_FIND_REQUIRED)
>
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Wengophone-commit mailing list
> [EMAIL PROTECTED]
> http://dev.openwengo.com/mailman/listinfo/wengophone-commit
--
http://www.cynapses.org/ - cybernetic synapses
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Wengophone-devel mailing list [email protected] http://dev.openwengo.com/mailman/listinfo/wengophone-devel
