Redo py3k branching from trunk again

[SVN r52115]
Make sure _MSC_VER is defined before checking its value.
2026-01-26 06:42:26 +00:00 · 2009-04-01 16:55:33 +00:00 · 2009-03-07 15:32:14 +00:00 · 2009-02-17 10:05:58 +00:00 · 2008-12-09 10:54:48 +00:00 · 2008-12-08 23:35:33 +00:00
6 changed files with 53 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,22 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    program_options.hpp
+    program_options
+)
+
+# Add a library target to the build system
+boost_library_project(
+  program_options
+  SRCDIRS  src
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  DESCRIPTION  "Access to configuration data given on command line, in config files and other sources."
+  MODULARIZED
+  AUTHORS  "Vladimir Prus <ghost -at- cs.msu.su>"
+  #  MAINTAINERS 
+)
+
+
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -5,6 +5,7 @@ toolset.using doxygen ;
 boostbook program_option 
    : program_options.xml 
    : <implicit-dependency>autodoc 
+      <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
    ;

 doxygen autodoc 
--- a/include/boost/program_options.hpp
+++ b/include/boost/program_options.hpp
@@ -8,7 +8,7 @@
 #ifndef PROGRAM_OPTIONS_VP_2003_05_19
 #define PROGRAM_OPTIONS_VP_2003_05_19

-#if _MSC_VER >= 1020
+#if defined(_MSC_VER) && _MSC_VER >= 1020
 #pragma once
 #endif

--- a/module.cmake
+++ b/module.cmake
@@ -0,0 +1,3 @@
+boost_module(program_options DEPENDS any bind smart_ptr tokenizer)
+
+# bind is needed because of a dependency on boost/mem_fn.hpp
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -0,0 +1,5 @@
+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
+  SHARED_COMPILE_FLAGS "-DBOOST_PROGRAM_OPTIONS_DYN_LINK=1")
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -0,0 +1,21 @@
+boost_additional_test_dependencies(program_options BOOST_DEPENDS test)
+
+set(PROGRAM_OPTIONS_LIBRARIES
+  boost_program_options
+  boost_test_exec_monitor)
+
+macro(program_options_test_run TESTNAME)
+  boost_test_run(${TESTNAME} 
+    DEPENDS boost_program_options boost_test_exec_monitor STATIC)
+  boost_test_run("${TESTNAME}_dll"
+    "${TESTNAME}.cpp"
+    DEPENDS boost_program_options boost_test_exec_monitor-static SHARED)
+endmacro(program_options_test_run)
+
+program_options_test_run(options_description_test) 
+program_options_test_run(parsers_test)
+program_options_test_run(variable_map_test)
+program_options_test_run(cmdline_test)
+program_options_test_run(positional_options_test)
+program_options_test_run(unicode_test) 
+program_options_test_run(winmain)
Author	SHA1	Message	Date
Haoyu Bai	0e8fa77ca3	Redo py3k branching from trunk again [SVN r52115]	2009-04-01 16:55:33 +00:00
Vladimir Prus	454c878389	Make sure _MSC_VER is defined before checking its value. [SVN r51639]	2009-03-07 15:32:14 +00:00
John Maddock	49bc2d6226	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
Daniel James	ee3079c247	Revert a change I accidentally checked in. [SVN r50219]	2008-12-09 10:54:48 +00:00
Daniel James	68fa36b0f6	Avoid a couple of gcc warnings. [SVN r50214]	2008-12-08 23:35:33 +00:00
Michael A. Jackson	ea2b309994	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	23019ff2ef	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00