ソースを参照

Merge cmake files release -> trunk.

[SVN r52866]
Troy D. Straszheim 17 年 前
コミット
c4e8412740
9 ファイル変更22 行追加9 行削除
  1. 2 2
      CMakeLists.txt
  2. 13 0
      CTestConfig.cmake
  3. 1 1
      libs/circular_buffer
  4. 1 1
      libs/program_options
  5. 1 1
      libs/python
  6. 1 1
      libs/regex
  7. 1 1
      libs/serialization
  8. 1 1
      libs/units
  9. 1 1
      tools/build

+ 2 - 2
CMakeLists.txt

@@ -77,9 +77,9 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 list(APPEND CMAKE_MODULE_PATH ${Boost_SOURCE_DIR}/tools/build/CMake)
 include(BoostUtils)
 include(BoostConfig)
-include(BoostBuildSlave)
 include(BoostCore)
 include(BoostDocs)
+include(CTest)
 include(BoostTesting)
 ##########################################################################
 
@@ -262,7 +262,7 @@ add_definitions(-DBOOST_ALL_NO_LIB=1)
 add_subdirectory(doc)
 
 # Add build rules for all of the Boost libraries
-add_subdirectory(${BOOST_LIBS_DIR})
+add_subdirectory(libs)
 
 # Add build rules for all of the Boost tools
 # TODO: On hold while I work on the modularity code

+ 13 - 0
CTestConfig.cmake

@@ -0,0 +1,13 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+## # The following are required to uses Dart and the Cdash dashboard
+##   ENABLE_TESTING()
+##   INCLUDE(CTest)
+set(CTEST_PROJECT_NAME "Boost")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "www.cdash.org")
+set(CTEST_DROP_LOCATION "/CDashPublic/submit.php?project=Boost")
+set(CTEST_DROP_SITE_CDASH TRUE)

+ 1 - 1
libs/circular_buffer

@@ -1 +1 @@
-Subproject commit 1f51450f237c09db59f3177724d313d87e708fcc
+Subproject commit c36065dc88eba6590f77907af7d7543a9a7dcef0

+ 1 - 1
libs/program_options

@@ -1 +1 @@
-Subproject commit e4ccf81e8212d6c34dba219cf2973bbae89d374a
+Subproject commit 98331c354279d601c487538db1c396918d0116ca

+ 1 - 1
libs/python

@@ -1 +1 @@
-Subproject commit 7a7b32661ea6e778b6b1521fa740c150aad0adad
+Subproject commit e16b3f8ab8132146a3cb3001e425fcf380389e69

+ 1 - 1
libs/regex

@@ -1 +1 @@
-Subproject commit 55d979060c47a833672f7735ffba3c5f55cc3973
+Subproject commit f310162a85f5af507fd97f342b52b5be8bde9a5c

+ 1 - 1
libs/serialization

@@ -1 +1 @@
-Subproject commit 406df28ee7022f1ac4d52df1afc1c231b37abfc4
+Subproject commit 54ee54aac5d3b4178762b67cb55338e9c6f38635

+ 1 - 1
libs/units

@@ -1 +1 @@
-Subproject commit dc650bf3576ea98611580375a8597c156b434bf0
+Subproject commit c919a0cf0e8a2b45cd150dbfff53d0b2dde8701d

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit f6a90eb76c28a664c0af6a31117ccbcbb7686cca
+Subproject commit 61add925726541d1a825a7160c36f51cd63a5055

粤ICP备19079148号