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 4b82282e25b84e06889d358f620e6bcd4a3372d2 (commit) via 8c6c1f16c94318630a547425637fdbc34f86f1fc (commit) from 2bd1a28dbd3b4304bed20f07d3e5f6e5581c4486 (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=4b82282e25b84e06889d358f620e6bcd4a3372d2 commit 4b82282e25b84e06889d358f620e6bcd4a3372d2 Merge: 2bd1a28 8c6c1f1 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Nov 12 08:22:53 2013 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Nov 12 08:22:53 2013 -0500 Merge branch 'test-RunCMake.CMP0037-everywhere' into next http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c6c1f16c94318630a547425637fdbc34f86f1fc commit 8c6c1f16c94318630a547425637fdbc34f86f1fc Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Nov 8 11:44:55 2013 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Nov 11 07:27:02 2013 -0500 Enable RunCMake.CMP0037 test everywhere Split the test cases covering spaces and colons into separate units. Run the space cases everywhere. Disable the colon cases where they are known to fail. This approach increases platform coverage for the test and makes the known-failure logic as local as possible. No Makefile generator on Windows can generate targets with ':' in their name because the CMakeFiles/<target>.dir directory cannot be created. Skip this part of the test on all Windows Make tools. diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW-result.txt b/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-result.txt similarity index 100% copy from Tests/RunCMake/CMP0037/CMP0037-NEW-result.txt copy to Tests/RunCMake/CMP0037/CMP0037-NEW-colon-result.txt diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt new file mode 100644 index 0000000..aadc7d7 --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt @@ -0,0 +1,19 @@ +CMake Error at CMP0037-NEW-colon.cmake:4 \(add_library\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "lib:colon" is not valid for certain CMake features, such + as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) ++ +CMake Error at CMP0037-NEW-colon.cmake:5 \(add_executable\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "exe:colon" is not valid for certain CMake features, such + as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW-colon.cmake b/Tests/RunCMake/CMP0037/CMP0037-NEW-colon.cmake new file mode 100644 index 0000000..5c564f3 --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-NEW-colon.cmake @@ -0,0 +1,5 @@ + +cmake_policy(SET CMP0037 NEW) + +add_library("lib:colon" empty.cpp) +add_executable("exe:colon" empty.cpp) diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW-result.txt b/Tests/RunCMake/CMP0037/CMP0037-NEW-space-result.txt similarity index 100% rename from Tests/RunCMake/CMP0037/CMP0037-NEW-result.txt rename to Tests/RunCMake/CMP0037/CMP0037-NEW-space-result.txt diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt new file mode 100644 index 0000000..169db86 --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt @@ -0,0 +1,19 @@ +CMake Error at CMP0037-NEW-space.cmake:4 \(add_library\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "lib with spaces" is not valid for certain CMake features, + such as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) ++ +CMake Error at CMP0037-NEW-space.cmake:5 \(add_executable\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "exe with spaces" is not valid for certain CMake features, + such as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CMP0037/CMP0037-WARN.cmake b/Tests/RunCMake/CMP0037/CMP0037-NEW-space.cmake similarity index 54% rename from Tests/RunCMake/CMP0037/CMP0037-WARN.cmake rename to Tests/RunCMake/CMP0037/CMP0037-NEW-space.cmake index 2beaad0..9e2faaa 100644 --- a/Tests/RunCMake/CMP0037/CMP0037-WARN.cmake +++ b/Tests/RunCMake/CMP0037/CMP0037-NEW-space.cmake @@ -1,5 +1,5 @@ +cmake_policy(SET CMP0037 NEW) + add_library("lib with spaces" empty.cpp) add_executable("exe with spaces" empty.cpp) -add_library("lib:colon" empty.cpp) -add_executable("exe:colon" empty.cpp) diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-NEW-stderr.txt deleted file mode 100644 index 6de96b1..0000000 --- a/Tests/RunCMake/CMP0037/CMP0037-NEW-stderr.txt +++ /dev/null @@ -1,39 +0,0 @@ -CMake Error at CMP0037-NEW.cmake:4 \(add_library\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "lib with spaces" is not valid for certain CMake features, - such as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Error at CMP0037-NEW.cmake:5 \(add_executable\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "exe with spaces" is not valid for certain CMake features, - such as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Error at CMP0037-NEW.cmake:6 \(add_library\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "lib:colon" is not valid for certain CMake features, such - as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Error at CMP0037-NEW.cmake:7 \(add_executable\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "exe:colon" is not valid for certain CMake features, such - as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CMP0037/CMP0037-NEW.cmake b/Tests/RunCMake/CMP0037/CMP0037-NEW.cmake deleted file mode 100644 index a6ffc59..0000000 --- a/Tests/RunCMake/CMP0037/CMP0037-NEW.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -cmake_policy(SET CMP0037 NEW) - -add_library("lib with spaces" empty.cpp) -add_executable("exe with spaces" empty.cpp) -add_library("lib:colon" empty.cpp) -add_executable("exe:colon" empty.cpp) diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-result.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-result.txt similarity index 100% copy from Tests/RunCMake/CMP0037/CMP0037-OLD-result.txt copy to Tests/RunCMake/CMP0037/CMP0037-OLD-space-result.txt diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt similarity index 100% rename from Tests/RunCMake/CMP0037/CMP0037-OLD-stderr.txt rename to Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD.cmake b/Tests/RunCMake/CMP0037/CMP0037-OLD-space.cmake similarity index 100% copy from Tests/RunCMake/CMP0037/CMP0037-OLD.cmake copy to Tests/RunCMake/CMP0037/CMP0037-OLD-space.cmake diff --git a/Tests/RunCMake/CMP0037/CMP0037-WARN-result.txt b/Tests/RunCMake/CMP0037/CMP0037-WARN-colon-result.txt similarity index 100% rename from Tests/RunCMake/CMP0037/CMP0037-WARN-result.txt rename to Tests/RunCMake/CMP0037/CMP0037-WARN-colon-result.txt diff --git a/Tests/RunCMake/CMP0037/CMP0037-WARN-colon-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-WARN-colon-stderr.txt new file mode 100644 index 0000000..c9366fa --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-WARN-colon-stderr.txt @@ -0,0 +1,21 @@ +CMake Warning \(dev\) at CMP0037-WARN-colon.cmake:2 \(add_library\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "lib:colon" is not valid for certain CMake features, such + as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. ++ +CMake Warning \(dev\) at CMP0037-WARN-colon.cmake:3 \(add_executable\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "exe:colon" is not valid for certain CMake features, such + as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/CMP0037/CMP0037-WARN-colon.cmake b/Tests/RunCMake/CMP0037/CMP0037-WARN-colon.cmake new file mode 100644 index 0000000..17c815e --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-WARN-colon.cmake @@ -0,0 +1,3 @@ + +add_library("lib:colon" empty.cpp) +add_executable("exe:colon" empty.cpp) diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-result.txt b/Tests/RunCMake/CMP0037/CMP0037-WARN-space-result.txt similarity index 100% rename from Tests/RunCMake/CMP0037/CMP0037-OLD-result.txt rename to Tests/RunCMake/CMP0037/CMP0037-WARN-space-result.txt diff --git a/Tests/RunCMake/CMP0037/CMP0037-WARN-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-WARN-space-stderr.txt new file mode 100644 index 0000000..b29aad5 --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-WARN-space-stderr.txt @@ -0,0 +1,21 @@ +CMake Warning \(dev\) at CMP0037-WARN-space.cmake:2 \(add_library\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "lib with spaces" is not valid for certain CMake features, + such as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. ++ +CMake Warning \(dev\) at CMP0037-WARN-space.cmake:3 \(add_executable\): + Policy CMP0037 is not set: Target names should match a validity pattern. + Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The target name "exe with spaces" is not valid for certain CMake features, + such as generator expressions, and may result in undefined behavior. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD.cmake b/Tests/RunCMake/CMP0037/CMP0037-WARN-space.cmake similarity index 73% rename from Tests/RunCMake/CMP0037/CMP0037-OLD.cmake rename to Tests/RunCMake/CMP0037/CMP0037-WARN-space.cmake index af98f12..4a10828 100644 --- a/Tests/RunCMake/CMP0037/CMP0037-OLD.cmake +++ b/Tests/RunCMake/CMP0037/CMP0037-WARN-space.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0037 OLD) - add_library("lib with spaces" empty.cpp) add_executable("exe with spaces" empty.cpp) diff --git a/Tests/RunCMake/CMP0037/CMP0037-WARN-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-WARN-stderr.txt deleted file mode 100644 index e7a9e1d..0000000 --- a/Tests/RunCMake/CMP0037/CMP0037-WARN-stderr.txt +++ /dev/null @@ -1,43 +0,0 @@ -CMake Warning \(dev\) at CMP0037-WARN.cmake:2 \(add_library\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "lib with spaces" is not valid for certain CMake features, - such as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. -+ -CMake Warning \(dev\) at CMP0037-WARN.cmake:3 \(add_executable\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "exe with spaces" is not valid for certain CMake features, - such as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. -+ -CMake Warning \(dev\) at CMP0037-WARN.cmake:4 \(add_library\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "lib:colon" is not valid for certain CMake features, such - as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. -+ -CMake Warning \(dev\) at CMP0037-WARN.cmake:5 \(add_executable\): - Policy CMP0037 is not set: Target names should match a validity pattern. - Run "cmake --help-policy CMP0037" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - The target name "exe:colon" is not valid for certain CMake features, such - as generator expressions, and may result in undefined behavior. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/CMP0037/RunCMakeTest.cmake b/Tests/RunCMake/CMP0037/RunCMakeTest.cmake index e983526..fbb1788 100644 --- a/Tests/RunCMake/CMP0037/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMP0037/RunCMakeTest.cmake @@ -1,5 +1,10 @@ include(RunCMake) -run_cmake(CMP0037-NEW) -run_cmake(CMP0037-OLD) -run_cmake(CMP0037-WARN) +run_cmake(CMP0037-OLD-space) +run_cmake(CMP0037-NEW-space) +run_cmake(CMP0037-WARN-space) +run_cmake(CMP0037-NEW-colon) + +if(NOT (WIN32 AND "${RunCMake_GENERATOR}" MATCHES "Make")) + run_cmake(CMP0037-WARN-colon) +endif() diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 6e72e70..bf3dcc1 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -56,9 +56,7 @@ add_RunCMake_test(CMP0022) add_RunCMake_test(CMP0026) add_RunCMake_test(CMP0027) add_RunCMake_test(CMP0028) -if (NOT "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW|NMake|Borland) Makefiles") - add_RunCMake_test(CMP0037) -endif() +add_RunCMake_test(CMP0037) add_RunCMake_test(CMP0038) add_RunCMake_test(CMP0039) add_RunCMake_test(CTest) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits