From: dgregor_at_[hidden]
Date: 2008-04-04 08:37:29
Author: dgregor
Date: 2008-04-04 08:37:28 EDT (Fri, 04 Apr 2008)
New Revision: 44031
URL: http://svn.boost.org/trac/boost/changeset/44031
Log:
Enable export code, which seems to cause a seg fault in CMake 2.6.0 RC 6
Text files modified:
branches/CMake/release/CMakeLists.txt | 4 +++-
branches/CMake/release/tools/build/CMake/BoostCore.cmake | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
Modified: branches/CMake/release/CMakeLists.txt
==============================================================================
--- branches/CMake/release/CMakeLists.txt (original)
+++ branches/CMake/release/CMakeLists.txt 2008-04-04 08:37:28 EDT (Fri, 04 Apr 2008)
@@ -100,7 +100,7 @@
REGEX ".svn" EXCLUDE)
if (NOT TEST_INSTALLED_TREE)
# If I don't have if around this, I get a seg fault
- # install(EXPORT boost-targets DESTINATION "lib/Boost${BOOST_VERSION}")
+ install(EXPORT boost-targets DESTINATION "lib/Boost${BOOST_VERSION}")
endif (NOT TEST_INSTALLED_TREE)
##########################################################################
@@ -141,6 +141,8 @@
set(CPACK_PACKAGE_FILE_NAME "Boost-${BOOST_VERSION}-vc71")
elseif (MSVC80)
set(CPACK_PACKAGE_FILE_NAME "Boost-${BOOST_VERSION}-vc8")
+ elseif (MSVC90)
+ set(CPACK_PACKAGE_FILE_NAME "Boost-${BOOST_VERSION}-vc9")
elseif (BORLAND)
set(CPACK_PACKAGE_FILE_NAME "Boost-${BOOST_VERSION}-borland")
endif (MSVC60)
Modified: branches/CMake/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostCore.cmake (original)
+++ branches/CMake/release/tools/build/CMake/BoostCore.cmake 2008-04-04 08:37:28 EDT (Fri, 04 Apr 2008)
@@ -451,8 +451,8 @@
endforeach(dependency "${THIS_LIB_DEPENDS}")
# Installation of this library variant
- install(TARGETS ${VARIANT_LIBNAME} DESTINATION lib)
-# EXPORT boost-targets)
+ install(TARGETS ${VARIANT_LIBNAME} DESTINATION lib
+ EXPORT boost-targets)
endif (THIS_VARIANT_OKAY)
endmacro(boost_library_variant)