[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1000-g8adfd13
Brad King
brad.king at kitware.com
Thu Mar 13 15:58:27 EDT 2014
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 8adfd132d97ba3e1f956fe4010777e2dee0320f5 (commit)
via a25b809f2075828e5ae488f74d85f5a31940460a (commit)
via 9914e7cd95b29ee85653ab952a377f61dabd5190 (commit)
via 34cd5fc451f8ff732ba192165ddf344dd9adcc68 (commit)
via d363cbf3156c5e8ef160ffbb45cfa269addebb50 (commit)
from 8e9638fb9829dd4239e6dde59c94ad03c21283e9 (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=8adfd132d97ba3e1f956fe4010777e2dee0320f5
commit 8adfd132d97ba3e1f956fe4010777e2dee0320f5
Merge: 8e9638f a25b809
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 15:58:26 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 13 15:58:26 2014 -0400
Merge topic 'fix-find_dependency-empty-version' into next
a25b809f Tests: Check find_dependency empty extra arguments
9914e7cd Merge branch 'fix-find_dependency-empty-version'
34cd5fc4 find_dependency: Give more helpful message if VERSION is empty
d363cbf3 Tests: Make RunCMake.find_dependency tolerate line number changes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a25b809f2075828e5ae488f74d85f5a31940460a
commit a25b809f2075828e5ae488f74d85f5a31940460a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 15:49:08 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 15:57:03 2014 -0400
Tests: Check find_dependency empty extra arguments
Add cases for empty arg 2 and arg 3.
diff --git a/Tests/RunCMake/find_dependency/RunCMakeTest.cmake b/Tests/RunCMake/find_dependency/RunCMakeTest.cmake
index b85104a..9403136 100644
--- a/Tests/RunCMake/find_dependency/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_dependency/RunCMakeTest.cmake
@@ -1,5 +1,7 @@
include(RunCMake)
run_cmake(EXACT-no-version)
+run_cmake(empty-version)
+run_cmake(empty-arg-3)
run_cmake(invalid-arg-3)
run_cmake(extra-args)
diff --git a/Tests/RunCMake/find_dependency/empty-arg-3-result.txt b/Tests/RunCMake/find_dependency/empty-arg-3-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/empty-arg-3-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt b/Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt
new file mode 100644
index 0000000..bf9b02b
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt
@@ -0,0 +1,5 @@
+CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:[0-9]+ \(message\):
+ Invalid arguments to find_dependency
+Call Stack \(most recent call first\):
+ empty-arg-3.cmake:4 \(find_dependency\)
+ CMakeLists.txt:4 \(include\)
diff --git a/Tests/RunCMake/find_dependency/empty-arg-3.cmake b/Tests/RunCMake/find_dependency/empty-arg-3.cmake
new file mode 100644
index 0000000..b08200a
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/empty-arg-3.cmake
@@ -0,0 +1,4 @@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(Pack1 1.2 "")
diff --git a/Tests/RunCMake/find_dependency/empty-version-result.txt b/Tests/RunCMake/find_dependency/empty-version-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/empty-version-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/find_dependency/empty-version-stderr.txt b/Tests/RunCMake/find_dependency/empty-version-stderr.txt
new file mode 100644
index 0000000..b5e9f46
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/empty-version-stderr.txt
@@ -0,0 +1,5 @@
+CMake Error at .*/Modules/CMakeFindDependencyMacro.cmake:[0-9]+ \(message\):
+ Invalid arguments to find_dependency. VERSION is empty
+Call Stack \(most recent call first\):
+ empty-version.cmake:4 \(find_dependency\)
+ CMakeLists.txt:4 \(include\)
diff --git a/Tests/RunCMake/find_dependency/empty-version.cmake b/Tests/RunCMake/find_dependency/empty-version.cmake
new file mode 100644
index 0000000..e6f17cd
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/empty-version.cmake
@@ -0,0 +1,4 @@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(Pack1 "")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9914e7cd95b29ee85653ab952a377f61dabd5190
commit 9914e7cd95b29ee85653ab952a377f61dabd5190
Merge: d363cbf 34cd5fc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 15:52:32 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 15:56:48 2014 -0400
Merge branch 'fix-find_dependency-empty-version'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34cd5fc451f8ff732ba192165ddf344dd9adcc68
commit 34cd5fc451f8ff732ba192165ddf344dd9adcc68
Author: Aurélien Gâteau <agateau at kde.org>
AuthorDate: Thu Mar 13 13:19:25 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 15:51:11 2014 -0400
find_dependency: Give more helpful message if VERSION is empty
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 99ffca8..73efaae 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -31,14 +31,17 @@ macro(find_dependency dep)
if (NOT ${dep}_FOUND)
set(cmake_fd_version)
if (${ARGC} GREATER 1)
- if (${ARGV1} STREQUAL EXACT)
+ if ("${ARGV1}" STREQUAL "")
+ message(FATAL_ERROR "Invalid arguments to find_dependency. VERSION is empty")
+ endif()
+ if ("${ARGV1}" STREQUAL EXACT)
message(FATAL_ERROR "Invalid arguments to find_dependency. EXACT may only be specified if a VERSION is specified")
endif()
set(cmake_fd_version ${ARGV1})
endif()
set(cmake_fd_exact_arg)
if(${ARGC} GREATER 2)
- if (NOT ${ARGV2} STREQUAL EXACT)
+ if (NOT "${ARGV2}" STREQUAL EXACT)
message(FATAL_ERROR "Invalid arguments to find_dependency")
endif()
set(cmake_fd_exact_arg EXACT)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d363cbf3156c5e8ef160ffbb45cfa269addebb50
commit d363cbf3156c5e8ef160ffbb45cfa269addebb50
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 15:46:30 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 15:47:08 2014 -0400
Tests: Make RunCMake.find_dependency tolerate line number changes
diff --git a/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt b/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt
index 6f4fc04..348f8bb 100644
--- a/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt
+++ b/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:35 \(message\):
+CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:[0-9]+ \(message\):
Invalid arguments to find_dependency. EXACT may only be specified if a
VERSION is specified
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/find_dependency/extra-args-stderr.txt b/Tests/RunCMake/find_dependency/extra-args-stderr.txt
index 1b52380..83a7f02 100644
--- a/Tests/RunCMake/find_dependency/extra-args-stderr.txt
+++ b/Tests/RunCMake/find_dependency/extra-args-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:47 \(message\):
+CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:[0-9]+ \(message\):
Invalid arguments to find_dependency
Call Stack \(most recent call first\):
extra-args.cmake:4 \(find_dependency\)
diff --git a/Tests/RunCMake/find_dependency/invalid-arg-3-stderr.txt b/Tests/RunCMake/find_dependency/invalid-arg-3-stderr.txt
index c36148f..fee8d5d 100644
--- a/Tests/RunCMake/find_dependency/invalid-arg-3-stderr.txt
+++ b/Tests/RunCMake/find_dependency/invalid-arg-3-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:42 \(message\):
+CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:[0-9]+ \(message\):
Invalid arguments to find_dependency
Call Stack \(most recent call first\):
invalid-arg-3.cmake:4 \(find_dependency\)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFindDependencyMacro.cmake | 7 +++++--
Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt | 2 +-
Tests/RunCMake/find_dependency/RunCMakeTest.cmake | 2 ++
.../empty-arg-3-result.txt} | 0
Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt | 5 +++++
.../{EXACT-no-version.cmake => empty-arg-3.cmake} | 2 +-
.../empty-version-result.txt} | 0
Tests/RunCMake/find_dependency/empty-version-stderr.txt | 5 +++++
.../{EXACT-no-version.cmake => empty-version.cmake} | 2 +-
Tests/RunCMake/find_dependency/extra-args-stderr.txt | 2 +-
Tests/RunCMake/find_dependency/invalid-arg-3-stderr.txt | 2 +-
11 files changed, 22 insertions(+), 7 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => find_dependency/empty-arg-3-result.txt} (100%)
create mode 100644 Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt
copy Tests/RunCMake/find_dependency/{EXACT-no-version.cmake => empty-arg-3.cmake} (54%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => find_dependency/empty-version-result.txt} (100%)
create mode 100644 Tests/RunCMake/find_dependency/empty-version-stderr.txt
copy Tests/RunCMake/find_dependency/{EXACT-no-version.cmake => empty-version.cmake} (55%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list