[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2907-g6489a4f
Stephen Kelly
steveire at gmail.com
Tue Jul 2 10:11:22 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6489a4fc663d511063c9b1b3c6d8ca30d8df47c3 (commit)
via 56ff34c5e5aa235e37ace0731b3d7ca49525b629 (commit)
via 0984e10212b514c248b4911b6ec530ec51f45dac (commit)
via d54d364ec9e2aa19225dbf7d8a5512c26d21f831 (commit)
via daf8af64469b5e167cd4d086c3af00d063e4e133 (commit)
from 1e4ae9a89b82bcd927cae7cd842ce2556ae572b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6489a4fc663d511063c9b1b3c6d8ca30d8df47c3
commit 6489a4fc663d511063c9b1b3c6d8ca30d8df47c3
Merge: 1e4ae9a 56ff34c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 10:11:20 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 2 10:11:20 2013 -0400
Merge topic 'target-policies' into next
56ff34c Rename test files to avoid VS6 compatibility issues.
0984e10 Rename test files to avoid VS6 compatibility issues.
d54d364 Rename test files to avoid VS6 compatibility issues.
daf8af6 Fix whitespace in docs.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56ff34c5e5aa235e37ace0731b3d7ca49525b629
commit 56ff34c5e5aa235e37ace0731b3d7ca49525b629
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 16:08:54 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 2 16:08:54 2013 +0200
Rename test files to avoid VS6 compatibility issues.
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake
index cbd8f18..11b4e22 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake
@@ -1,9 +1,9 @@
project(CMP0022-WARN-tll)
-add_library(foo SHARED empty.cpp)
-add_library(bar SHARED empty.cpp)
-add_library(bat SHARED empty.cpp)
+add_library(foo SHARED empty_vs6_1.cpp)
+add_library(bar SHARED empty_vs6_2.cpp)
+add_library(bat SHARED empty_vs6_3.cpp)
target_link_libraries(bar LINK_PUBLIC foo)
set_property(TARGET bar PROPERTY LINK_INTERFACE_LIBRARIES bat)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0984e10212b514c248b4911b6ec530ec51f45dac
commit 0984e10212b514c248b4911b6ec530ec51f45dac
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 16:06:08 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 2 16:07:36 2013 +0200
Rename test files to avoid VS6 compatibility issues.
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 0caa235..da15d62 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -232,14 +232,14 @@ target_link_libraries(testSharedLibDepends LINK_PUBLIC renamed_on_export)
target_link_libraries(testSharedLibDepends LINK_INTERFACE_LIBRARIES
$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:$<TARGET_NAME:testSharedLibRequired>>)
-add_library(cmp0022OLD SHARED cmp0022.cpp)
+add_library(cmp0022OLD SHARED cmp0022_vs6_1.cpp)
generate_export_header(cmp0022OLD BASE_NAME cmp0022)
target_include_directories(cmp0022OLD PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/cmp0022>"
)
cmake_policy(SET CMP0022 NEW)
-add_library(cmp0022NEW SHARED cmp0022.cpp)
+add_library(cmp0022NEW SHARED cmp0022_vs6_1.cpp)
target_include_directories(cmp0022NEW PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/cmp0022>"
diff --git a/Tests/ExportImport/Export/cmp0022_vs6_1.cpp b/Tests/ExportImport/Export/cmp0022_vs6_1.cpp
new file mode 100644
index 0000000..a6ec838
--- /dev/null
+++ b/Tests/ExportImport/Export/cmp0022_vs6_1.cpp
@@ -0,0 +1 @@
+#include "cmp0022.cpp"
diff --git a/Tests/ExportImport/Export/cmp0022_vs6_2.cpp b/Tests/ExportImport/Export/cmp0022_vs6_2.cpp
new file mode 100644
index 0000000..a6ec838
--- /dev/null
+++ b/Tests/ExportImport/Export/cmp0022_vs6_2.cpp
@@ -0,0 +1 @@
+#include "cmp0022.cpp"
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 9073498..376abac 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -68,14 +68,14 @@ target_link_libraries(imp_testExe1b
bld_testLibCycleA
)
-add_executable(cmp0022OLD_test cmp0022OLD_test.cpp)
+add_executable(cmp0022OLD_test cmp0022OLD_test_vs6_1.cpp)
target_link_libraries(cmp0022OLD_test bld_cmp0022OLD)
-add_executable(cmp0022NEW_test cmp0022NEW_test.cpp)
+add_executable(cmp0022NEW_test cmp0022NEW_test_vs6_1.cpp)
target_link_libraries(cmp0022NEW_test bld_cmp0022NEW)
-add_executable(cmp0022OLD_exp_test cmp0022OLD_test.cpp)
+add_executable(cmp0022OLD_exp_test cmp0022OLD_test_vs6_2.cpp)
target_link_libraries(cmp0022OLD_exp_test exp_cmp0022OLD)
-add_executable(cmp0022NEW_exp_test cmp0022NEW_test.cpp)
+add_executable(cmp0022NEW_exp_test cmp0022NEW_test_vs6_2.cpp)
target_link_libraries(cmp0022NEW_exp_test exp_cmp0022NEW)
# Try building a plugin to an executable imported from the build tree.
diff --git a/Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_1.cpp b/Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_1.cpp
new file mode 100644
index 0000000..033b746
--- /dev/null
+++ b/Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_1.cpp
@@ -0,0 +1 @@
+#include "cmp0022NEW_test.cpp"
diff --git a/Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_2.cpp b/Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_2.cpp
new file mode 100644
index 0000000..033b746
--- /dev/null
+++ b/Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_2.cpp
@@ -0,0 +1 @@
+#include "cmp0022NEW_test.cpp"
diff --git a/Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_1.cpp b/Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_1.cpp
new file mode 100644
index 0000000..90d804c
--- /dev/null
+++ b/Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_1.cpp
@@ -0,0 +1 @@
+#include "cmp0022OLD_test.cpp"
diff --git a/Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_2.cpp b/Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_2.cpp
new file mode 100644
index 0000000..90d804c
--- /dev/null
+++ b/Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_2.cpp
@@ -0,0 +1 @@
+#include "cmp0022OLD_test.cpp"
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export.cmake b/Tests/RunCMake/CMP0022/CMP0022-export.cmake
index e947b3a..06147f3 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-export.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-export.cmake
@@ -3,8 +3,8 @@ project(cmp0022NEW)
cmake_policy(SET CMP0022 NEW)
-add_library(cmp0022NEW SHARED empty.cpp)
-add_library(testLib SHARED empty.cpp)
+add_library(cmp0022NEW SHARED empty_vs6_1.cpp)
+add_library(testLib SHARED empty_vs6_2.cpp)
set_property(TARGET cmp0022NEW APPEND PROPERTY LINK_INTERFACE_LIBRARIES testLib)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake b/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake
index 8e5c847..171febe 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake
@@ -3,8 +3,8 @@ project(cmp0022NEW)
cmake_policy(SET CMP0022 NEW)
-add_library(cmp0022NEW SHARED empty.cpp)
-add_library(testLib SHARED empty.cpp)
+add_library(cmp0022NEW SHARED empty_vs6_1.cpp)
+add_library(testLib SHARED empty_vs6_2.cpp)
set_property(TARGET cmp0022NEW APPEND PROPERTY LINK_INTERFACE_LIBRARIES testLib)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d54d364ec9e2aa19225dbf7d8a5512c26d21f831
commit d54d364ec9e2aa19225dbf7d8a5512c26d21f831
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 15:58:52 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 2 16:05:59 2013 +0200
Rename test files to avoid VS6 compatibility issues.
diff --git a/Tests/InterfaceLinkLibraries/CMakeLists.txt b/Tests/InterfaceLinkLibraries/CMakeLists.txt
index 2366c26..bd0cf74 100644
--- a/Tests/InterfaceLinkLibraries/CMakeLists.txt
+++ b/Tests/InterfaceLinkLibraries/CMakeLists.txt
@@ -4,46 +4,46 @@ cmake_policy(SET CMP0022 NEW)
project(InterfaceLinkLibraries)
-add_library(foo_shared SHARED foo.cpp)
+add_library(foo_shared SHARED foo_vs6_1.cpp)
target_compile_definitions(foo_shared INTERFACE FOO_LIBRARY)
-add_library(bar_shared SHARED bar.cpp)
+add_library(bar_shared SHARED bar_vs6_1.cpp)
target_compile_definitions(bar_shared INTERFACE BAR_LIBRARY)
set_property(TARGET bar_shared APPEND PROPERTY INTERFACE_LINK_LIBRARIES foo_shared)
-add_executable(shared_test main.cpp)
+add_executable(shared_test main_vs6_1.cpp)
set_property(TARGET shared_test APPEND PROPERTY LINK_LIBRARIES bar_shared)
-add_library(foo_static STATIC foo.cpp)
+add_library(foo_static STATIC foo_vs6_2.cpp)
target_compile_definitions(foo_static INTERFACE FOO_LIBRARY)
-add_library(bar_static STATIC bar.cpp)
+add_library(bar_static STATIC bar_vs6_2.cpp)
target_compile_definitions(bar_static INTERFACE BAR_LIBRARY)
set_property(TARGET bar_static APPEND PROPERTY INTERFACE_LINK_LIBRARIES foo_static)
-add_executable(static_test main.cpp)
+add_executable(static_test main_vs6_2.cpp)
set_property(TARGET static_test APPEND PROPERTY LINK_LIBRARIES bar_static)
-add_library(foo_shared_private SHARED foo.cpp)
+add_library(foo_shared_private SHARED foo_vs6_3.cpp)
target_compile_definitions(foo_shared_private INTERFACE FOO_LIBRARY)
-add_library(bang_shared_private SHARED bang.cpp)
+add_library(bang_shared_private SHARED bang_vs6_1.cpp)
target_compile_definitions(bang_shared_private INTERFACE BANG_LIBRARY)
-add_library(bar_shared_private SHARED bar.cpp)
+add_library(bar_shared_private SHARED bar_vs6_3.cpp)
target_compile_definitions(bar_shared_private INTERFACE BAR_LIBRARY)
target_compile_definitions(bar_shared_private PRIVATE BAR_USE_BANG)
set_property(TARGET bar_shared_private APPEND PROPERTY LINK_LIBRARIES bang_shared_private)
set_property(TARGET bar_shared_private APPEND PROPERTY INTERFACE_LINK_LIBRARIES foo_shared_private)
-add_executable(shared_private_test main.cpp)
+add_executable(shared_private_test main_vs6_3.cpp)
set_property(TARGET shared_private_test APPEND PROPERTY LINK_LIBRARIES bar_shared_private)
-add_library(foo_static_private STATIC foo.cpp)
+add_library(foo_static_private STATIC foo_vs6_4.cpp)
target_compile_definitions(foo_static_private INTERFACE FOO_LIBRARY)
-add_library(bang_static_private STATIC bang.cpp)
+add_library(bang_static_private STATIC bang_vs6_2.cpp)
target_compile_definitions(bang_static_private INTERFACE BANG_LIBRARY)
-add_library(bar_static_private STATIC bar.cpp)
+add_library(bar_static_private STATIC bar_vs6_4.cpp)
target_compile_definitions(bar_static_private INTERFACE BAR_LIBRARY)
target_compile_definitions(bar_static_private PRIVATE BAR_USE_BANG)
set_property(TARGET bar_static_private APPEND PROPERTY LINK_LIBRARIES bang_static_private)
set_property(TARGET bar_static_private APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<LINK_ONLY:bang_static_private> foo_static_private)
-add_executable(InterfaceLinkLibraries main.cpp)
+add_executable(InterfaceLinkLibraries main_vs6_4.cpp)
set_property(TARGET InterfaceLinkLibraries APPEND PROPERTY LINK_LIBRARIES bar_static_private)
diff --git a/Tests/InterfaceLinkLibraries/bang_vs6_1.cpp b/Tests/InterfaceLinkLibraries/bang_vs6_1.cpp
new file mode 100644
index 0000000..4886861
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/bang_vs6_1.cpp
@@ -0,0 +1 @@
+#include "bang.cpp"
diff --git a/Tests/InterfaceLinkLibraries/bang_vs6_2.cpp b/Tests/InterfaceLinkLibraries/bang_vs6_2.cpp
new file mode 100644
index 0000000..4886861
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/bang_vs6_2.cpp
@@ -0,0 +1 @@
+#include "bang.cpp"
diff --git a/Tests/InterfaceLinkLibraries/bar_vs6_1.cpp b/Tests/InterfaceLinkLibraries/bar_vs6_1.cpp
new file mode 100644
index 0000000..58a04c4
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/bar_vs6_1.cpp
@@ -0,0 +1 @@
+#include "bar.cpp"
diff --git a/Tests/InterfaceLinkLibraries/bar_vs6_2.cpp b/Tests/InterfaceLinkLibraries/bar_vs6_2.cpp
new file mode 100644
index 0000000..58a04c4
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/bar_vs6_2.cpp
@@ -0,0 +1 @@
+#include "bar.cpp"
diff --git a/Tests/InterfaceLinkLibraries/bar_vs6_3.cpp b/Tests/InterfaceLinkLibraries/bar_vs6_3.cpp
new file mode 100644
index 0000000..58a04c4
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/bar_vs6_3.cpp
@@ -0,0 +1 @@
+#include "bar.cpp"
diff --git a/Tests/InterfaceLinkLibraries/bar_vs6_4.cpp b/Tests/InterfaceLinkLibraries/bar_vs6_4.cpp
new file mode 100644
index 0000000..58a04c4
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/bar_vs6_4.cpp
@@ -0,0 +1 @@
+#include "bar.cpp"
diff --git a/Tests/InterfaceLinkLibraries/foo_vs6_1.cpp b/Tests/InterfaceLinkLibraries/foo_vs6_1.cpp
new file mode 100644
index 0000000..d2e5e52
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/foo_vs6_1.cpp
@@ -0,0 +1 @@
+#include "foo.cpp"
diff --git a/Tests/InterfaceLinkLibraries/foo_vs6_2.cpp b/Tests/InterfaceLinkLibraries/foo_vs6_2.cpp
new file mode 100644
index 0000000..d2e5e52
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/foo_vs6_2.cpp
@@ -0,0 +1 @@
+#include "foo.cpp"
diff --git a/Tests/InterfaceLinkLibraries/foo_vs6_3.cpp b/Tests/InterfaceLinkLibraries/foo_vs6_3.cpp
new file mode 100644
index 0000000..d2e5e52
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/foo_vs6_3.cpp
@@ -0,0 +1 @@
+#include "foo.cpp"
diff --git a/Tests/InterfaceLinkLibraries/foo_vs6_4.cpp b/Tests/InterfaceLinkLibraries/foo_vs6_4.cpp
new file mode 100644
index 0000000..d2e5e52
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/foo_vs6_4.cpp
@@ -0,0 +1 @@
+#include "foo.cpp"
diff --git a/Tests/InterfaceLinkLibraries/main_vs6_1.cpp b/Tests/InterfaceLinkLibraries/main_vs6_1.cpp
new file mode 100644
index 0000000..9b10ef2
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/main_vs6_1.cpp
@@ -0,0 +1 @@
+#include "main.cpp"
diff --git a/Tests/InterfaceLinkLibraries/main_vs6_2.cpp b/Tests/InterfaceLinkLibraries/main_vs6_2.cpp
new file mode 100644
index 0000000..9b10ef2
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/main_vs6_2.cpp
@@ -0,0 +1 @@
+#include "main.cpp"
diff --git a/Tests/InterfaceLinkLibraries/main_vs6_3.cpp b/Tests/InterfaceLinkLibraries/main_vs6_3.cpp
new file mode 100644
index 0000000..9b10ef2
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/main_vs6_3.cpp
@@ -0,0 +1 @@
+#include "main.cpp"
diff --git a/Tests/InterfaceLinkLibraries/main_vs6_4.cpp b/Tests/InterfaceLinkLibraries/main_vs6_4.cpp
new file mode 100644
index 0000000..9b10ef2
--- /dev/null
+++ b/Tests/InterfaceLinkLibraries/main_vs6_4.cpp
@@ -0,0 +1 @@
+#include "main.cpp"
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
index 7542a14..3e4144f 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
@@ -1,8 +1,8 @@
project(CMP0022-NOWARN-static)
-add_library(foo STATIC empty.cpp)
-add_library(bar STATIC empty.cpp)
-add_library(bat STATIC empty.cpp)
+add_library(foo STATIC empty_vs6_1.cpp)
+add_library(bar STATIC empty_vs6_2.cpp)
+add_library(bat STATIC empty_vs6_3.cpp)
target_link_libraries(foo bar)
target_link_libraries(bar bat)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake
index 7d68687..b3cb131 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake
@@ -1,9 +1,9 @@
project(CMP0022-WARN)
-add_library(foo STATIC empty.cpp)
-add_library(bar STATIC empty.cpp)
-add_library(bat STATIC empty.cpp)
+add_library(foo STATIC empty_vs6_1.cpp)
+add_library(bar STATIC empty_vs6_2.cpp)
+add_library(bat STATIC empty_vs6_3.cpp)
set_property(TARGET bar PROPERTY INTERFACE_LINK_LIBRARIES foo)
set_property(TARGET bar PROPERTY LINK_LIBRARIES bat)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake
index f5fdb3a..24b7f45 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake
@@ -1,9 +1,9 @@
project(CMP0022-WARN)
-add_library(foo SHARED empty.cpp)
-add_library(bar SHARED empty.cpp)
-add_library(bat SHARED empty.cpp)
+add_library(foo SHARED empty_vs6_1.cpp)
+add_library(bar SHARED empty_vs6_2.cpp)
+add_library(bat SHARED empty_vs6_3.cpp)
set_property(TARGET bar PROPERTY INTERFACE_LINK_LIBRARIES foo)
set_property(TARGET bar PROPERTY LINK_INTERFACE_LIBRARIES bat)
diff --git a/Tests/RunCMake/CMP0022/empty_vs6_1.cpp b/Tests/RunCMake/CMP0022/empty_vs6_1.cpp
new file mode 100644
index 0000000..7efedab
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/empty_vs6_1.cpp
@@ -0,0 +1 @@
+#include "empty.cpp"
diff --git a/Tests/RunCMake/CMP0022/empty_vs6_2.cpp b/Tests/RunCMake/CMP0022/empty_vs6_2.cpp
new file mode 100644
index 0000000..7efedab
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/empty_vs6_2.cpp
@@ -0,0 +1 @@
+#include "empty.cpp"
diff --git a/Tests/RunCMake/CMP0022/empty_vs6_3.cpp b/Tests/RunCMake/CMP0022/empty_vs6_3.cpp
new file mode 100644
index 0000000..7efedab
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/empty_vs6_3.cpp
@@ -0,0 +1 @@
+#include "empty.cpp"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=daf8af64469b5e167cd4d086c3af00d063e4e133
commit daf8af64469b5e167cd4d086c3af00d063e4e133
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 15:49:56 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 2 15:49:56 2013 +0200
Fix whitespace in docs.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 75fcdb7..70c28d4 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -563,7 +563,8 @@ cmPolicies::cmPolicies()
"INTERFACE_LINK_LIBRARIES property will be processed and generated for "
"the IMPORTED target by default. A new option to the install(EXPORT) "
"and export commands allows export of the old-style properties for "
- "compatibility with downstream users of CMake versions older than 2.8.12."
+ "compatibility with downstream users of CMake versions older than "
+ "2.8.12. "
"The target_link_libraries command will no longer populate the "
"properties matching LINK_INTERFACE_LIBRARIES(_<CONFIG>)? if this policy "
"is NEW."
@@ -571,7 +572,7 @@ cmPolicies::cmPolicies()
"The OLD behavior for this policy is to ignore the "
"INTERFACE_LINK_LIBRARIES property for in-build targets. "
"The NEW behavior for this policy is to use the INTERFACE_LINK_LIBRARIES "
- "property for in-build targets, and ignore the old properties matching"
+ "property for in-build targets, and ignore the old properties matching "
"(IMPORTED_)?LINK_INTERFACE_LIBRARIES(_<CONFIG>)?.",
2,8,11,20130516, cmPolicies::WARN);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmPolicies.cxx | 5 ++-
Tests/ExportImport/Export/CMakeLists.txt | 4 +-
Tests/ExportImport/Export/cmp0022_vs6_1.cpp | 1 +
Tests/ExportImport/Export/cmp0022_vs6_2.cpp | 1 +
Tests/ExportImport/Import/A/CMakeLists.txt | 8 +++---
.../Import/A/cmp0022NEW_test_vs6_1.cpp | 1 +
.../Import/A/cmp0022NEW_test_vs6_2.cpp | 1 +
.../Import/A/cmp0022OLD_test_vs6_1.cpp | 1 +
.../Import/A/cmp0022OLD_test_vs6_2.cpp | 1 +
Tests/InterfaceLinkLibraries/CMakeLists.txt | 28 ++++++++++----------
Tests/InterfaceLinkLibraries/bang_vs6_1.cpp | 1 +
Tests/InterfaceLinkLibraries/bang_vs6_2.cpp | 1 +
Tests/InterfaceLinkLibraries/bar_vs6_1.cpp | 1 +
Tests/InterfaceLinkLibraries/bar_vs6_2.cpp | 1 +
Tests/InterfaceLinkLibraries/bar_vs6_3.cpp | 1 +
Tests/InterfaceLinkLibraries/bar_vs6_4.cpp | 1 +
Tests/InterfaceLinkLibraries/foo_vs6_1.cpp | 1 +
Tests/InterfaceLinkLibraries/foo_vs6_2.cpp | 1 +
Tests/InterfaceLinkLibraries/foo_vs6_3.cpp | 1 +
Tests/InterfaceLinkLibraries/foo_vs6_4.cpp | 1 +
Tests/InterfaceLinkLibraries/main_vs6_1.cpp | 1 +
Tests/InterfaceLinkLibraries/main_vs6_2.cpp | 1 +
Tests/InterfaceLinkLibraries/main_vs6_3.cpp | 1 +
Tests/InterfaceLinkLibraries/main_vs6_4.cpp | 1 +
Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake | 6 ++--
Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake | 6 ++--
Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake | 6 ++--
Tests/RunCMake/CMP0022/CMP0022-WARN.cmake | 6 ++--
Tests/RunCMake/CMP0022/CMP0022-export.cmake | 4 +-
.../RunCMake/CMP0022/CMP0022-install-export.cmake | 4 +-
Tests/RunCMake/CMP0022/empty_vs6_1.cpp | 1 +
Tests/RunCMake/CMP0022/empty_vs6_2.cpp | 1 +
Tests/RunCMake/CMP0022/empty_vs6_3.cpp | 1 +
33 files changed, 62 insertions(+), 38 deletions(-)
create mode 100644 Tests/ExportImport/Export/cmp0022_vs6_1.cpp
create mode 100644 Tests/ExportImport/Export/cmp0022_vs6_2.cpp
create mode 100644 Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_1.cpp
create mode 100644 Tests/ExportImport/Import/A/cmp0022NEW_test_vs6_2.cpp
create mode 100644 Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_1.cpp
create mode 100644 Tests/ExportImport/Import/A/cmp0022OLD_test_vs6_2.cpp
create mode 100644 Tests/InterfaceLinkLibraries/bang_vs6_1.cpp
create mode 100644 Tests/InterfaceLinkLibraries/bang_vs6_2.cpp
create mode 100644 Tests/InterfaceLinkLibraries/bar_vs6_1.cpp
create mode 100644 Tests/InterfaceLinkLibraries/bar_vs6_2.cpp
create mode 100644 Tests/InterfaceLinkLibraries/bar_vs6_3.cpp
create mode 100644 Tests/InterfaceLinkLibraries/bar_vs6_4.cpp
create mode 100644 Tests/InterfaceLinkLibraries/foo_vs6_1.cpp
create mode 100644 Tests/InterfaceLinkLibraries/foo_vs6_2.cpp
create mode 100644 Tests/InterfaceLinkLibraries/foo_vs6_3.cpp
create mode 100644 Tests/InterfaceLinkLibraries/foo_vs6_4.cpp
create mode 100644 Tests/InterfaceLinkLibraries/main_vs6_1.cpp
create mode 100644 Tests/InterfaceLinkLibraries/main_vs6_2.cpp
create mode 100644 Tests/InterfaceLinkLibraries/main_vs6_3.cpp
create mode 100644 Tests/InterfaceLinkLibraries/main_vs6_4.cpp
create mode 100644 Tests/RunCMake/CMP0022/empty_vs6_1.cpp
create mode 100644 Tests/RunCMake/CMP0022/empty_vs6_2.cpp
create mode 100644 Tests/RunCMake/CMP0022/empty_vs6_3.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list