From: dgregor_at_[hidden]
Date: 2007-06-08 23:07:32
Author: dgregor
Date: 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
New Revision: 4503
URL: http://svn.boost.org/trac/boost/changeset/4503
Log:
CMake: Rename boost_library macro to boost_add_library
Text files modified:
sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/python/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/src/CMakeLists.txt | 4 ++--
sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/test/src/CMakeLists.txt | 6 +++---
sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/wave/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake | 37 +++++++++++++++++--------------------
14 files changed, 33 insertions(+), 36 deletions(-)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,5 +1,5 @@
add_definitions(-DBOOST_DATE_TIME_NO_LIB=1)
-boost_library(
+boost_add_library(
boost_date_time
gregorian/greg_month.cpp gregorian/greg_weekday.cpp gregorian/date_generators.cpp
STATIC_COMPILE_FLAGS -DBOOST_DATE_TIME_STATIC_LINK
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,4 +1,4 @@
-boost_library(
+boost_add_library(
boost_filesystem
exception.cpp operations.cpp path.cpp portability.cpp utf8_codecvt_facet.cpp
SHARED_COMPILE_FLAGS "-DBOOST_FILESYSTEM_DYN_LINK=1"
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -19,7 +19,7 @@
"${BOOST_GRAPH_OPTIONAL_LIBRARIES} ${EXPAT_LIBRARIES}")
endif (EXPAT_FOUND)
-boost_library(
+boost_add_library(
boost_graph
read_graphviz_spirit.cpp ${BOOST_GRAPH_OPTIONAL_SOURCES}
LINK_LIBS ${BOOST_GRAPH_OPTIONAL_LIBRARIES}
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -26,7 +26,7 @@
# NOTE: What to do about BZIP2_NEED_PREFIX?
endif(BZIP2_FOUND)
-boost_library(boost_iostreams
+boost_add_library(boost_iostreams
file_descriptor.cpp mapped_file.cpp ${BOOST_IOSTREAMS_EXTRA_SOURCES}
LINK_LIBS "${BOOST_IOSTREAMS_LIBRARIES}"
SHARED_COMPILE_FLAGS "-DBOOST_IOSTREAMS_DYN_LINK=1")
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,4 +1,4 @@
-boost_library(boost_program_options
+boost_add_library(boost_program_options
cmdline.cpp config_file.cpp options_description.cpp parsers.cpp
variables_map.cpp value_semantic.cpp positional_options.cpp
utf8_codecvt_facet.cpp convert.cpp winmain.cpp
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/python/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/python/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/python/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,4 +1,4 @@
-boost_library(boost_python
+boost_add_library(boost_python
numeric.cpp
list.cpp
long.cpp
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -7,7 +7,7 @@
set(BOOST_REGEX_LIBRARIES ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
endif (ICU_FOUND AND ICU_I18N_FOUND)
-boost_library(boost_regex
+boost_add_library(boost_regex
c_regex_traits.cpp
cpp_regex_traits.cpp
cregex.cpp
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -87,4 +87,4 @@
# <define>BOOST_REGEX_NO_LIB=1
# : # test name
# captures_test
-# ]
\ No newline at end of file
+# ]
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -42,14 +42,14 @@
xml_woarchive.cpp
)
-boost_library(boost_serialization
+boost_add_library(boost_serialization
${SOURCES}
SHARED_COMPILE_FLAGS -DBOOST_SERIALIZATION_DYN_LINK=1
)
option(BUILD_BOOST_WSERIALIZATION "Build wide-char boost serialization libs" ON)
if (BUILD_BOOST_WSERIALIZATION)
- boost_library(boost_wserialization
+ boost_add_library(boost_wserialization
${WSOURCES}
SHARED_COMPILE_FLAGS "-DBOOST_SERIALIZATION_DYN_LINK=1 -DBOOST_WSERIALIZATION_DYN_LINK=1"
DEPENDS boost_serialization
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,6 +1,6 @@
add_definitions(-DBOOST_SIGNALS_NO_LIB=1)
-boost_library(
+boost_add_library(
boost_signals
trackable.cpp connection.cpp named_slot_map.cpp signal_base.cpp slot.cpp
SHARED_COMPILE_FLAGS "-DBOOST_SIGNALS_DYN_LINK=1"
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/test/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/test/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/test/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -12,12 +12,12 @@
add_definitions(-w-8080)
endif(BORLAND)
-boost_library(boost_prg_exec_monitor
+boost_add_library(boost_prg_exec_monitor
execution_monitor.cpp cpp_main.cpp
STATIC_TAG
SHARED_COMPILE_FLAGS -DBOOST_TEST_DYN_LINK=1 ${BOOST_SHARED_COMPILE_FLAGS})
-boost_library(boost_test_exec_monitor
+boost_add_library(boost_test_exec_monitor
NO_SHARED
compiler_log_formatter.cpp
execution_monitor.cpp
@@ -37,7 +37,7 @@
xml_report_formatter.cpp
)
-boost_library(boost_unit_test_framework
+boost_add_library(boost_unit_test_framework
compiler_log_formatter.cpp
exception_safety.cpp
execution_monitor.cpp
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,4 +1,4 @@
-boost_library(
+boost_add_library(
boost_thread
barrier.cpp condition.cpp exceptions.cpp mutex.cpp once.cpp recursive_mutex.cpp
thread.cpp tss_hooks.cpp tss_dll.cpp tss_pe.cpp tss.cpp xtime.cpp
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/wave/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/wave/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/wave/src/CMakeLists.txt 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -1,4 +1,4 @@
-boost_library(
+boost_add_library(
boost_wave
instantiate_cpp_exprgrammar.cpp
instantiate_cpp_grammar.cpp
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake 2007-06-08 23:07:31 EDT (Fri, 08 Jun 2007)
@@ -13,8 +13,8 @@
# boost_library_project: Defines a Boost library project (e.g., #
# Boost.Python). #
# #
-# boost_library: Builds library binaries for Boost libraries with #
-# compiled sources (e.g., boost_filesystem). #
+# boost_add_library: Builds library binaries for Boost libraries #
+# with compiled sources (e.g., boost_filesystem). #
##########################################################################
# Defines a Boost library project (e.g., for Boost.Python). Use as:
@@ -392,18 +392,18 @@
# different compilation options, as determined by the set of "default"
# library variants.
#
-# boost_library(libname
-# source1 source2 ...
-# [COMPILE_FLAGS compileflags]
-# [feature_COMPILE_FLAGS compileflags]
-# [LINK_FLAGS linkflags]
-# [feature_LINK_FLAGS linkflags]
-# [LINK_LIBS linklibs]
-# [feature_LINK_LIBS linklibs]
-# [DEPENDS libdepend1 libdepend2 ...]
-# [STATIC_TAG]
-# [MODULE]
-# [NOT_feature])
+# boost_add_library(libname
+# source1 source2 ...
+# [COMPILE_FLAGS compileflags]
+# [feature_COMPILE_FLAGS compileflags]
+# [LINK_FLAGS linkflags]
+# [feature_LINK_FLAGS linkflags]
+# [LINK_LIBS linklibs]
+# [feature_LINK_LIBS linklibs]
+# [DEPENDS libdepend1 libdepend2 ...]
+# [STATIC_TAG]
+# [MODULE]
+# [NOT_feature])
#
# where libname is the name of Boost library binary (e.g.,
# "boost_regex") and source1, source2, etc. are the source files used
@@ -490,7 +490,7 @@
#
#
# Example:
-# boost_library(
+# boost_add_library(
# boost_thread
# barrier.cpp condition.cpp exceptions.cpp mutex.cpp once.cpp
# recursive_mutex.cpp thread.cpp tss_hooks.cpp tss_dll.cpp tss_pe.cpp
@@ -499,10 +499,7 @@
# STATIC_COMPILE_FLAGS "-DBOOST_THREAD_BUILD_LIB=1"
# NO_SINGLE_THREADED
# )
-#
-# TODO:
-# - Rename this to boost_add_library.
-macro(boost_library LIBNAME)
+macro(boost_add_library LIBNAME)
parse_arguments(THIS_LIB
"DEPENDS;COMPILE_FLAGS;LINK_FLAGS;LINK_LIBS;${BOOST_ADDLIB_ARG_NAMES}"
"STATIC_TAG;MODULE;${BOOST_ADDLIB_OPTION_NAMES}"
@@ -520,6 +517,6 @@
separate_arguments(VARIANT)
boost_library_variant(${LIBNAME} ${VARIANT})
endforeach(VARIANT_STR ${BOOST_DEFAULT_VARIANTS})
-endmacro(boost_library)
+endmacro(boost_add_library)
# TODO: Create boost_add_executable, which deals with variants well
\ No newline at end of file