Просмотр исходного кода

Merge trunk changes from 41110.

[SVN r41112]
Beman Dawes 18 лет назад
Родитель
Сommit
1bc1b6af7c
2 измененных файлов с 22 добавлено и 5 удалено
  1. 5 2
      tools/Jamfile.v2
  2. 17 3
      tools/regression/build/Jamroot.jam

+ 5 - 2
tools/Jamfile.v2

@@ -14,12 +14,15 @@ project
     <link>static
     ;
 
+use-project /boost/regression : regression/build ;
+
 TOOLS =
     bcp//bcp
     inspect/build//inspect
     quickbook//quickbook
-    regression/build//compiler_status
-    regression/build//process_jam_log
+    /boost/regression//compiler_status
+    /boost/regression//library_status
+    /boost/regression//process_jam_log
     wave/build//wave
     ;
 

+ 17 - 3
tools/regression/build/Jamroot.jam

@@ -25,9 +25,21 @@ else
         ;
 }
 
+obj tiny_xml
+    :
+    detail/tiny_xml.cpp
+    :
+    <define>BOOST_ALL_NO_LIB=1
+    <define>_CRT_SECURE_NO_WARNINGS
+    :
+    release
+    ;
+explicit tiny_xml ;
+
 exe process_jam_log
     :
-    process_jam_log.cpp detail/tiny_xml.cpp
+    process_jam_log.cpp
+    tiny_xml
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
@@ -39,7 +51,8 @@ exe process_jam_log
 
 exe compiler_status
     :
-    compiler_status.cpp detail/tiny_xml.cpp
+    compiler_status.cpp
+    tiny_xml
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1
@@ -50,7 +63,8 @@ explicit compiler_status ;
 
 exe library_status
     :
-    library_status.cpp detail/tiny_xml.cpp
+    library_status.cpp
+    tiny_xml
     /boost/filesystem//boost_filesystem/<link>static
     :
     <define>BOOST_ALL_NO_LIB=1

粤ICP备19079148号