[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-262-gc4c6427
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, master has been updated via c4c6427ed656e181d569d1c7baca29813c12b9fb (commit) from b801205dad50246b82ce2572a25581ed6e27345d (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=c4c6427ed656e181d569d1c7baca29813c12b9fb commit c4c6427ed656e181d569d1c7baca29813c12b9fb Author: Kitware Robot AuthorDate: Wed Mar 12 00:01:12 2014 -0400 Commit: Kitware Robot CommitDate: Wed Mar 12 00:01:12 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 18e328a..aaddd92 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) -set(CMake_VERSION_PATCH 20140311) +set(CMake_VERSION_PATCH 20140312) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-863-gd3796df
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 d3796df8de8007102802c3a1355259141625f93c (commit)
via be2d73af5b8f2f42a97aa9b10cafb3dbb0eba2e6 (commit)
via 751c5d714c3071ec7efa9d210b09774f029cdb2d (commit)
via ea5fb2db813c13ff5cfe8eb9449681e258a9a6be (commit)
via 5de8baa71f24b871bb40abbd3bdf3da2020c8622 (commit)
via 5e60e0bbc3847bb785ae0a384fa76b7b053307a0 (commit)
via a3b0411b652963040d7f7f961fb3ddd2cb53e61c (commit)
via aa5400e1408a3a39db467d58e1b51701251f07e2 (commit)
from e23ed2c41f8bda7072f302f67f955cb16e302eba (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=d3796df8de8007102802c3a1355259141625f93c
commit d3796df8de8007102802c3a1355259141625f93c
Merge: e23ed2c be2d73a
Author: Ben Boeckel
AuthorDate: Tue Mar 11 14:46:57 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 14:46:57 2014 -0400
Merge topic 'dev/faster-evis' into next
be2d73af EVIS: update error message
751c5d71 tests: Update trailing '\' expected output
ea5fb2db EVIS: Improve invalid escape character error
5de8baa7 tests: Rename the EscapeCharsDisallowed generated tests
5e60e0bb tests: Rename Bracket3 to Unquoted2
a3b0411b tests: Remove the edits to RunCMake.cmake
aa5400e1 Utilities/Release: Use ${VAR} instead of @VAR@ syntax
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be2d73af5b8f2f42a97aa9b10cafb3dbb0eba2e6
commit be2d73af5b8f2f42a97aa9b10cafb3dbb0eba2e6
Author: Ben Boeckel
AuthorDate: Tue Mar 11 14:43:11 2014 -0400
Commit: Ben Boeckel
CommitDate: Tue Mar 11 14:43:11 2014 -0400
EVIS: update error message
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f2d3f9b..df4d305 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2947,7 +2947,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
}
else
{
- errorstr += "' (at end of input)";
+ errorstr += "' (at end of input).";
}
error = true;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=751c5d714c3071ec7efa9d210b09774f029cdb2d
commit 751c5d714c3071ec7efa9d210b09774f029cdb2d
Author: Ben Boeckel
AuthorDate: Tue Mar 11 14:40:00 2014 -0400
Commit: Ben Boeckel
CommitDate: Tue Mar 11 14:40:00 2014 -0400
tests: Update trailing '\' expected output
diff --git a/Tests/RunCMake/Syntax/Escape2-stderr.txt
b/Tests/RunCMake/Syntax/Escape2-stderr.txt
index dc46686..cc3bdf0 100644
--- a/Tests/RunCMake/Syntax/Escape2-stderr.txt
+++ b/Tests/RunCMake/Syntax/Escape2-stderr.txt
@@ -7,7 +7,7 @@ CMake Error at Escape2.cmake:4 \(message\):
\\
- Invalid character escape '\\0'.
+ Invalid character escape '\\' \(at end of input\).
Call Stack \(most recent call first\):
Escape2.cmake:7 \(escape\)
CMakeLists.txt:3 \(include\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea5fb2db813c13ff5cfe8eb9449681e258a9a6be
commit ea5fb2db813c13ff5cfe8eb9449681e258a9a6be
Author: Ben Boeckel
AuthorDate: Tue Mar 11 14:39:44 2014 -0400
Commit: Ben Boeckel
CommitDate: Tue Mar 11 14:39:44 2014 -0400
EVIS: Improve invalid escape character error
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 824a2d8..f2d3f9b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2939,16 +2939,16 @@ cmake::MessageType
cmMakefile::ExpandVariablesInStringNew(
}
else if (isalnum(nextc) || nextc == '\0')
{
-errorstr += "Invalid character escape \'";
+errorstr += "Invalid character escape '\\";
if (nextc)
{
errorstr += nextc;
+ errorstr += "'.";
}
else
{
- errorstr += "\\0";
+ errorstr += "' (at end of input)";
}
-errorstr += "\'.";
error = true;
}
else
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de8baa71f24b871bb40abbd3bdf3da2020c8622
commit 5de8baa71f24b871bb40abbd3bdf3da2020c8622
Author: Ben Boeckel
AuthorDate: Tue Mar 11 14:39:18 2014 -0400
Commit: Ben Boeckel
CommitDate: Tue Mar 11 14:39:18 2014 -0400
tests: Rename the EscapeCharsDisallowed generated tests
diff --git a/Tests/RunCMake/Syntax/char-result.txt
b/Tests/RunCMake/Syntax/EscapeChar-char-result.txt
similarity index 100%
rename from Tests/RunCMake/Syntax/char-result.txt
rename to Tests/RunCMake/Syntax/EscapeChar-char-result.txt
diff --git a/Tests/RunCMa
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-845-g7b5da68
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 7b5da6892d5b716c5382295d416232af3c1ba2c3 (commit)
via 1c4cfca4270eea1be95f57935e9df72e4e3f8b88 (commit)
via 16ce9a786c8552aaaebe8ab25427b1d916cd6c05 (commit)
from 45b6ef2741674d9f8ff10d6e57a11c511804ad21 (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=7b5da6892d5b716c5382295d416232af3c1ba2c3
commit 7b5da6892d5b716c5382295d416232af3c1ba2c3
Merge: 45b6ef2 1c4cfca
Author: Daniele E. Domenichelli
AuthorDate: Tue Mar 11 10:37:51 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 10:37:51 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next
1c4cfca4 FindPkgConfig: Remove empty values from the list
16ce9a78 FindPkgConfig: Remove unneeded string replacement
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c4cfca4270eea1be95f57935e9df72e4e3f8b88
commit 1c4cfca4270eea1be95f57935e9df72e4e3f8b88
Author: Daniele E. Domenichelli
AuthorDate: Tue Mar 11 15:37:18 2014 +0100
Commit: Daniele E. Domenichelli
CommitDate: Tue Mar 11 15:37:18 2014 +0100
FindPkgConfig: Remove empty values from the list
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index fcb1c08..fee45b6 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -250,6 +250,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
# Prepare and set the environment variable
if(NOT "${_pkgconfig_path}" STREQUAL "")
+# remove empty values from the list
+list(REMOVE_ITEM _pkgconfig_path "")
file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
if(UNIX)
string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16ce9a786c8552aaaebe8ab25427b1d916cd6c05
commit 16ce9a786c8552aaaebe8ab25427b1d916cd6c05
Author: Daniele E. Domenichelli
AuthorDate: Tue Mar 11 15:36:50 2014 +0100
Commit: Daniele E. Domenichelli
CommitDate: Tue Mar 11 15:36:50 2014 +0100
FindPkgConfig: Remove unneeded string replacement
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index aacdc8f..fcb1c08 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -193,25 +193,16 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
if(NOT _no_cmake_environment_path)
if(NOT "$ENV{CMAKE_PREFIX_PATH}" STREQUAL "")
file(TO_CMAKE_PATH "$ENV{CMAKE_PREFIX_PATH}" _path)
-if(UNIX)
- string(REPLACE "\\:" ";" _path "${_path}")
-endif()
list(APPEND _extra_paths ${_path})
unset(_path)
endif()
if(NOT "$ENV{CMAKE_FRAMEWORK_PATH}" STREQUAL "")
file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _path)
-if(UNIX)
- string(REPLACE "\\:" ";" _path "${_path}")
-endif()
list(APPEND _extra_paths ${_path})
unset(_path)
endif()
if(NOT "$ENV{CMAKE_APPBUNDLE_PATH}" STREQUAL "")
file(TO_CMAKE_PATH "$ENV{CMAKE_APPBUNDLE_PATH}" _path)
-if(UNIX)
- string(REPLACE "\\:" ";" _path "${_path}")
-endif()
list(APPEND _extra_paths ${_path})
unset(_path)
endif()
---
Summary of changes:
Modules/FindPkgConfig.cmake | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-839-gebe9450
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 ebe9450487ff80abcd15e2e970f7bcddc541d517 (commit)
via f74a8405b6caa8ac253ce0357642a244ab192410 (commit)
from c85949bfc938a4710b89ee7fdbf8fc0d70b29aea (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=ebe9450487ff80abcd15e2e970f7bcddc541d517
commit ebe9450487ff80abcd15e2e970f7bcddc541d517
Merge: c85949b f74a840
Author: Stephen Kelly
AuthorDate: Tue Mar 11 09:52:30 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 09:52:30 2014 -0400
Merge topic 'fix-find_dependency-EXACT-for-master' into next
f74a8405 Test error cases in find_dependency.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f74a8405b6caa8ac253ce0357642a244ab192410
commit f74a8405b6caa8ac253ce0357642a244ab192410
Author: Stephen Kelly
AuthorDate: Tue Mar 11 14:36:58 2014 +0100
Commit: Stephen Kelly
CommitDate: Tue Mar 11 14:48:35 2014 +0100
Test error cases in find_dependency.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d401a93..499d12b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -49,6 +49,7 @@ add_RunCMake_test(GeneratorToolset)
add_RunCMake_test(TargetPropertyGeneratorExpressions)
add_RunCMake_test(Languages)
add_RunCMake_test(ObjectLibrary)
+add_RunCMake_test(find_dependency)
if(NOT WIN32)
add_RunCMake_test(PositionIndependentCode)
set(SKIP_VISIBILITY 0)
diff --git a/Tests/RunCMake/find_dependency/CMakeLists.txt
b/Tests/RunCMake/find_dependency/CMakeLists.txt
new file mode 100644
index 000..04d09f2
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/find_dependency/EXACT-no-version-result.txt
b/Tests/RunCMake/find_dependency/EXACT-no-version-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/EXACT-no-version-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt
b/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt
new file mode 100644
index 000..6f4fc04
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at .*Modules/CMakeFindDependencyMacro.cmake:35 \(message\):
+ Invalid arguments to find_dependency. EXACT may only be specified if a
+ VERSION is specified
+Call Stack \(most recent call first\):
+ EXACT-no-version.cmake:4 \(find_dependency\)
+ CMakeLists.txt:4 \(include\)
diff --git a/Tests/RunCMake/find_dependency/EXACT-no-version.cmake
b/Tests/RunCMake/find_dependency/EXACT-no-version.cmake
new file mode 100644
index 000..b05665b7
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/EXACT-no-version.cmake
@@ -0,0 +1,4 @@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(Pack1 EXACT)
diff --git a/Tests/RunCMake/find_dependency/Pack1/Pack1Config.cmake
b/Tests/RunCMake/find_dependency/Pack1/Pack1Config.cmake
new file mode 100644
index 000..7d55ef6
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/Pack1/Pack1Config.cmake
@@ -0,0 +1,2 @@
+
+add_library(Pack1::Lib INTERFACE IMPORTED)
diff --git a/Tests/RunCMake/find_dependency/Pack1/Pack1ConfigVersion.cmake
b/Tests/RunCMake/find_dependency/Pack1/Pack1ConfigVersion.cmake
new file mode 100644
index 000..dfb7b6c
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/Pack1/Pack1ConfigVersion.cmake
@@ -0,0 +1,11 @@
+
+set(PACKAGE_VERSION "1.3")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
diff --git a/Tests/RunCMake/find_dependency/RunCMakeTest.cmake
b/Tests/RunCMake/find_dependency/RunCMakeTest.cmake
new file mode 100644
index 000..b85104a
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/RunCMakeTest.cmake
@@ -0,0 +1,5 @@
+include(RunCMake)
+
+run_cmake(EXACT-no-version)
+run_cmake(invalid-arg-3)
+run_cmake(extra-args)
diff --git a/Tests/RunCMake/find_dependency/extra-args-result.txt
b/Tests/RunCMake/find_dependency/extra-args-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_dependency/extra-args-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/find_dependency/extra-args-stderr.txt
b/Tests/RunCMake/find_dependency
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-837-gc85949b
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 c85949bfc938a4710b89ee7fdbf8fc0d70b29aea (commit)
via 224f50f42f8776e4742851daca32846d1041fbb9 (commit)
from e25470eec69a77c5e10a18183700be53958448f5 (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=c85949bfc938a4710b89ee7fdbf8fc0d70b29aea
commit c85949bfc938a4710b89ee7fdbf8fc0d70b29aea
Merge: e25470e 224f50f
Author: Stephen Kelly
AuthorDate: Tue Mar 11 09:52:08 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 09:52:08 2014 -0400
Merge topic 'fix-find_dependency-EXACT' into next
224f50f4 find_dependency: Make sure invalid EXACT use can be reported.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=224f50f42f8776e4742851daca32846d1041fbb9
commit 224f50f42f8776e4742851daca32846d1041fbb9
Author: Stephen Kelly
AuthorDate: Tue Mar 11 14:49:30 2014 +0100
Commit: Stephen Kelly
CommitDate: Tue Mar 11 14:51:06 2014 +0100
find_dependency: Make sure invalid EXACT use can be reported.
Test the first argument directly for matching 'EXACT'. The error
check in its previous position was incorrect and would only trigger
with a version of '0' or similar.
diff --git a/Modules/CMakeFindDependencyMacro.cmake
b/Modules/CMakeFindDependencyMacro.cmake
index 8c61516..99ffca8 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -31,6 +31,9 @@ macro(find_dependency dep)
if (NOT ${dep}_FOUND)
set(cmake_fd_version)
if (${ARGC} GREATER 1)
+ 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)
@@ -38,9 +41,6 @@ macro(find_dependency dep)
if (NOT ${ARGV2} STREQUAL EXACT)
message(FATAL_ERROR "Invalid arguments to find_dependency")
endif()
- if (NOT ${cmake_fd_version})
-message(FATAL_ERROR "Invalid arguments to find_dependency. EXACT may
only be specified if a VERSION is specified")
- endif()
set(cmake_fd_exact_arg EXACT)
endif()
if(${ARGC} GREATER 3)
---
Summary of changes:
Modules/CMakeFindDependencyMacro.cmake |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-235-ga2d63a9
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, master has been updated via a2d63a9d04cede727ffedcc38ce1c1e8df0c7945 (commit) via fc2bad57fffc671025a86e23fb29dcb0fd4a7aed (commit) from 64b93354dc6207ad270f2c5e72e43c54d7d3af67 (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=a2d63a9d04cede727ffedcc38ce1c1e8df0c7945 commit a2d63a9d04cede727ffedcc38ce1c1e8df0c7945 Merge: 64b9335 fc2bad5 Author: Brad King AuthorDate: Tue Mar 11 09:13:53 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:13:53 2014 -0400 Merge topic 'fix-Qt4-DBus-macro' fc2bad57 Qt4: Use correct qdbus executable in macro. --- Summary of changes: Modules/Qt4Macros.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-249-g8559c32
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, master has been updated via 8559c326c4e79272c621fd8418fc279544d01cd7 (commit) via 172d8d94f4aa71a7c134513d48d8647d0d230215 (commit) from 312a6b7bde9b794655040022b8adfdd40c2b2071 (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=8559c326c4e79272c621fd8418fc279544d01cd7 commit 8559c326c4e79272c621fd8418fc279544d01cd7 Merge: 312a6b7 172d8d9 Author: Brad King AuthorDate: Tue Mar 11 09:14:05 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:14:05 2014 -0400 Merge topic 'cmELF-typo' 172d8d94 cmELF: Fix typo in comment, 32-bit => 64-bit (#14799) --- Summary of changes: Source/cmELF.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-835-ge25470e
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 e25470eec69a77c5e10a18183700be53958448f5 (commit) via b801205dad50246b82ce2572a25581ed6e27345d (commit) from a5ed8457f4d61316231be0d516c5f26a567c0239 (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=e25470eec69a77c5e10a18183700be53958448f5 commit e25470eec69a77c5e10a18183700be53958448f5 Merge: a5ed845 b801205 Author: Brad King AuthorDate: Tue Mar 11 09:19:20 2014 -0400 Commit: Brad King CommitDate: Tue Mar 11 09:19:20 2014 -0400 Merge branch 'master' into next --- 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
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-261-gb801205
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, master has been updated via b801205dad50246b82ce2572a25581ed6e27345d (commit) via 93d5c4dc22e0c430320117a08e0faf081f31ffa0 (commit) via ef1c1153d34548863bcc5cb6d767881eb5b93b04 (commit) from ea6b47d2d5e9e0b7879698b1dfca7483312b83a7 (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=b801205dad50246b82ce2572a25581ed6e27345d commit b801205dad50246b82ce2572a25581ed6e27345d Merge: ea6b47d 93d5c4d Author: Brad King AuthorDate: Tue Mar 11 09:18:28 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:18:28 2014 -0400 Merge topic 'ctest-coverage-extra' 93d5c4dc Help: Add release notes for topic 'ctest-coverage-extra' ef1c1153 CTest: Teach ctest_coverage() to read CTEST_COVERAGE_EXTRA_FLAGS --- Summary of changes: Help/release/dev/ctest-coverage-extra.rst |5 + Source/CTest/cmCTestCoverageCommand.cxx |3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/ctest-coverage-extra.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-833-ga5ed845
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 a5ed8457f4d61316231be0d516c5f26a567c0239 (commit) via ea6b47d2d5e9e0b7879698b1dfca7483312b83a7 (commit) via 29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046 (commit) via ebaa5a641026d01e58debedb92bd23322513e48c (commit) via 29ff93a9706ed5c6942f821085ace37fbdebba14 (commit) via ef0386c25025901ee1afa1355603ea9a373f7eba (commit) from 3f49a8995efff62a30194ff0cb4887f603e44c40 (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=a5ed8457f4d61316231be0d516c5f26a567c0239 commit a5ed8457f4d61316231be0d516c5f26a567c0239 Merge: 3f49a89 ea6b47d Author: Brad King AuthorDate: Tue Mar 11 09:16:48 2014 -0400 Commit: Brad King CommitDate: Tue Mar 11 09:16:48 2014 -0400 Merge branch 'master' into next --- 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
[Cmake-commits] CMake branch, release, updated. v3.0.0-rc1-25-g29d4f6b
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, release has been updated via 29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046 (commit) via 764e977ad7a881bc5144f09890b6bf50ac455cf4 (commit) via ebaa5a641026d01e58debedb92bd23322513e48c (commit) via 29ff93a9706ed5c6942f821085ace37fbdebba14 (commit) via ef0386c25025901ee1afa1355603ea9a373f7eba (commit) via 112cba927abfd54e72d12831dc668148c1465446 (commit) via fc2bad57fffc671025a86e23fb29dcb0fd4a7aed (commit) via 08ba128f51c94e3e905d45cc36c6fb21d020df56 (commit) from 9d4394ee872d6147d81564a8537e597a76f14bbd (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 - --- Summary of changes: Help/manual/cmake-variables.7.rst |2 ++ Help/variable/CMAKE_APPBUNDLE_PATH.rst |5 + Help/variable/CMAKE_FRAMEWORK_PATH.rst |6 ++ Modules/CMakeFindDependencyMacro.cmake | 13 +++-- Modules/Qt4Macros.cmake|2 +- Source/cmQtAutoGenerators.cxx | 12 Tests/QtAutogen/CMakeLists.txt |8 +++- Tests/QtAutogen/generated.h|5 +++-- Tests/QtAutogen/myotherinterface.h.in | 14 ++ 9 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 Help/variable/CMAKE_APPBUNDLE_PATH.rst create mode 100644 Help/variable/CMAKE_FRAMEWORK_PATH.rst create mode 100644 Tests/QtAutogen/myotherinterface.h.in hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-258-gea6b47d
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, master has been updated via ea6b47d2d5e9e0b7879698b1dfca7483312b83a7 (commit) via 29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046 (commit) via ebaa5a641026d01e58debedb92bd23322513e48c (commit) via 29ff93a9706ed5c6942f821085ace37fbdebba14 (commit) via ef0386c25025901ee1afa1355603ea9a373f7eba (commit) from a86617902d58aa1a29d8d9d4db47a4c37dc37a4c (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 - --- 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
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-827-g3f49a89
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 3f49a8995efff62a30194ff0cb4887f603e44c40 (commit) via a86617902d58aa1a29d8d9d4db47a4c37dc37a4c (commit) via 1b809c09ff12928545c0b482f82a88ad38da70a4 (commit) via 8559c326c4e79272c621fd8418fc279544d01cd7 (commit) via 312a6b7bde9b794655040022b8adfdd40c2b2071 (commit) via 70c6eda8c2bf36aeaf83616c860c5a6563bd88f4 (commit) via 3d3adc0c5781860913c113a8b0fec6a9afc11ee4 (commit) via 510ceb19edf930899521dbbb825f315f46b6e989 (commit) via c9241cad83318f39a1ccefd03e72a8a958c1bbbc (commit) via dfcacecd18d0cf26c4a4318eb4ce5901b90eee69 (commit) via a2d63a9d04cede727ffedcc38ce1c1e8df0c7945 (commit) via 64b93354dc6207ad270f2c5e72e43c54d7d3af67 (commit) from 25b006f5dc5f373f7dd7da1453c13587c7820508 (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=3f49a8995efff62a30194ff0cb4887f603e44c40 commit 3f49a8995efff62a30194ff0cb4887f603e44c40 Merge: 25b006f a866179 Author: Brad King AuthorDate: Tue Mar 11 09:15:28 2014 -0400 Commit: Brad King CommitDate: Tue Mar 11 09:15:28 2014 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-245-g70c6eda
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, master has been updated via 70c6eda8c2bf36aeaf83616c860c5a6563bd88f4 (commit) via b79a1f67195f6bb7fddd52215f442f319139b531 (commit) from 3d3adc0c5781860913c113a8b0fec6a9afc11ee4 (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=70c6eda8c2bf36aeaf83616c860c5a6563bd88f4 commit 70c6eda8c2bf36aeaf83616c860c5a6563bd88f4 Merge: 3d3adc0 b79a1f6 Author: Brad King AuthorDate: Tue Mar 11 09:14:01 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:14:01 2014 -0400 Merge topic 'FindFreetype-path-suffix-without-include' b79a1f67 FindFreetype: Add plain 'freetype2' path suffix --- Summary of changes: Modules/FindFreetype.cmake |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-241-g510ceb1
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, master has been updated via 510ceb19edf930899521dbbb825f315f46b6e989 (commit) via 112cba927abfd54e72d12831dc668148c1465446 (commit) from c9241cad83318f39a1ccefd03e72a8a958c1bbbc (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=510ceb19edf930899521dbbb825f315f46b6e989 commit 510ceb19edf930899521dbbb825f315f46b6e989 Merge: c9241ca 112cba9 Author: Brad King AuthorDate: Tue Mar 11 09:13:58 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:13:58 2014 -0400 Merge topic 'fix-AUTOGEN-custom-command-depends' 112cba92 QtAutogen: Fix AUTOGEN depends on custom command output with VS. --- Summary of changes: Source/cmQtAutoGenerators.cxx | 12 Tests/QtAutogen/CMakeLists.txt|8 +++- Tests/QtAutogen/generated.h |5 +++-- Tests/QtAutogen/myotherinterface.h.in | 14 ++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 Tests/QtAutogen/myotherinterface.h.in hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-253-ga866179
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, master has been updated via a86617902d58aa1a29d8d9d4db47a4c37dc37a4c (commit) via e8c027bcc014eb2b84b663af9b79a5eefc437973 (commit) from 1b809c09ff12928545c0b482f82a88ad38da70a4 (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=a86617902d58aa1a29d8d9d4db47a4c37dc37a4c commit a86617902d58aa1a29d8d9d4db47a4c37dc37a4c Merge: 1b809c0 e8c027b Author: Brad King AuthorDate: Tue Mar 11 09:14:08 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:14:08 2014 -0400 Merge topic 'cmcurl-include-first' e8c027bc cmcurl: Include the local curl directories before all others. --- Summary of changes: Utilities/cmcurl/CMakeLists.txt |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-237-gdfcacec
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, master has been updated via dfcacecd18d0cf26c4a4318eb4ce5901b90eee69 (commit) via 08ba128f51c94e3e905d45cc36c6fb21d020df56 (commit) from a2d63a9d04cede727ffedcc38ce1c1e8df0c7945 (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=dfcacecd18d0cf26c4a4318eb4ce5901b90eee69 commit dfcacecd18d0cf26c4a4318eb4ce5901b90eee69 Merge: a2d63a9 08ba128 Author: Brad King AuthorDate: Tue Mar 11 09:13:54 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:13:54 2014 -0400 Merge topic 'fix-find_dependency-EXACT' 08ba128f find_dependency: Don't propagate EXACT argument. --- Summary of changes: Modules/CMakeFindDependencyMacro.cmake | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-251-g1b809c0
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, master has been updated via 1b809c09ff12928545c0b482f82a88ad38da70a4 (commit) via f1b689b64a96fbf1e6f3b154d1bd4ee28ea3d625 (commit) from 8559c326c4e79272c621fd8418fc279544d01cd7 (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=1b809c09ff12928545c0b482f82a88ad38da70a4 commit 1b809c09ff12928545c0b482f82a88ad38da70a4 Merge: 8559c32 f1b689b Author: Brad King AuthorDate: Tue Mar 11 09:14:07 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:14:07 2014 -0400 Merge topic 'watcom-VERBOSE-and-ERROR' f1b689b6 Makefile: Improve handling of WMake verbose output and errors --- Summary of changes: Source/cmGlobalWatcomWMakeGenerator.cxx |3 +-- Source/cmLocalUnixMakefileGenerator3.cxx | 37 -- Source/cmLocalUnixMakefileGenerator3.h |7 -- 3 files changed, 26 insertions(+), 21 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-239-gc9241ca
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, master has been updated
via c9241cad83318f39a1ccefd03e72a8a958c1bbbc (commit)
via 45abfb0c4d622c86880b2b32619f79417410a6c8 (commit)
from dfcacecd18d0cf26c4a4318eb4ce5901b90eee69 (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=c9241cad83318f39a1ccefd03e72a8a958c1bbbc
commit c9241cad83318f39a1ccefd03e72a8a958c1bbbc
Merge: dfcacec 45abfb0
Author: Brad King
AuthorDate: Tue Mar 11 09:13:56 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 09:13:56 2014 -0400
Merge topic 'fix-find_dependency-EXACT-for-master'
45abfb0c find_dependency: Extend the tests for use of EXACT macro parameter.
---
Summary of changes:
Tests/Module/FindDependency/CMakeLists.txt |3 ++-
Tests/Module/FindDependency/main.cpp | 12
.../Module/FindDependency/packages/Pack4/Pack4Config.cmake |9 +
.../Pack4ConfigVersion.cmake} |2 +-
.../Module/FindDependency/packages/Pack5/Pack5Config.cmake |3 +++
.../Pack5ConfigVersion.cmake} |2 +-
.../Module/FindDependency/packages/Pack6/Pack6Config.cmake |3 +++
.../Pack6ConfigVersion.cmake} |2 +-
8 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 Tests/Module/FindDependency/packages/Pack4/Pack4Config.cmake
copy Tests/Module/FindDependency/packages/{Pack1/Pack1ConfigVersion.cmake =>
Pack4/Pack4ConfigVersion.cmake} (90%)
create mode 100644 Tests/Module/FindDependency/packages/Pack5/Pack5Config.cmake
copy Tests/Module/FindDependency/packages/{Pack1/Pack1ConfigVersion.cmake =>
Pack5/Pack5ConfigVersion.cmake} (90%)
create mode 100644 Tests/Module/FindDependency/packages/Pack6/Pack6Config.cmake
copy Tests/Module/FindDependency/packages/{Pack1/Pack1ConfigVersion.cmake =>
Pack6/Pack6ConfigVersion.cmake} (90%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-247-g312a6b7
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, master has been updated via 312a6b7bde9b794655040022b8adfdd40c2b2071 (commit) via 6c90f0a6938cf2ed2190db34ebc918a9e29fe4bf (commit) from 70c6eda8c2bf36aeaf83616c860c5a6563bd88f4 (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=312a6b7bde9b794655040022b8adfdd40c2b2071 commit 312a6b7bde9b794655040022b8adfdd40c2b2071 Merge: 70c6eda 6c90f0a Author: Brad King AuthorDate: Tue Mar 11 09:14:03 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:14:03 2014 -0400 Merge topic 'ninja-command-line-length-haiku' 6c90f0a6 Ninja: Detect command-line length limit on Haiku --- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-243-g3d3adc0
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, master has been updated via 3d3adc0c5781860913c113a8b0fec6a9afc11ee4 (commit) via d71db3a0d88fd41c7e8f3ef23368e919d5c5cded (commit) from 510ceb19edf930899521dbbb825f315f46b6e989 (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=3d3adc0c5781860913c113a8b0fec6a9afc11ee4 commit 3d3adc0c5781860913c113a8b0fec6a9afc11ee4 Merge: 510ceb1 d71db3a Author: Brad King AuthorDate: Tue Mar 11 09:14:00 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 09:14:00 2014 -0400 Merge topic 'FindSDL-consistent-path-suffixes' d71db3a0 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module --- Summary of changes: Modules/FindSDL_image.cmake |4 +++- Modules/FindSDL_mixer.cmake |4 +++- Modules/FindSDL_net.cmake |4 +++- Modules/FindSDL_sound.cmake |4 +++- Modules/FindSDL_ttf.cmake |4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-812-g698031a
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 698031a5a9daacecd984a3a25522c5c20324b75b (commit)
via 8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248 (commit)
via 6852fb8034d30d14498dc874378881696a6ada23 (commit)
from efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd (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=698031a5a9daacecd984a3a25522c5c20324b75b
commit 698031a5a9daacecd984a3a25522c5c20324b75b
Merge: efb4d85 8c9bfac
Author: Brad King
AuthorDate: Tue Mar 11 09:01:51 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 09:01:51 2014 -0400
Merge topic 'fix-xcode-compiler-force' into next
8c9bfac3 Xcode: Convert forced CMAKE__COMPILER to full path if
possible
6852fb80 CMakeDetermine*Compiler: Factor out search for compiler in PATH
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248
commit 8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248
Author: Brad King
AuthorDate: Mon Mar 10 16:57:59 2014 -0400
Commit: Brad King
CommitDate: Mon Mar 10 17:12:00 2014 -0400
Xcode: Convert forced CMAKE__COMPILER to full path if possible
During cross-compiling the toolchain file may use CMakeForceCompiler to
force a compiler setting. When using the Xcode generator try to convert
it to a full path by searching the PATH as is done for the Makefile
generators.
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index 4f7ae24..aa4cdc9 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -42,6 +42,7 @@ endif()
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_C_COMPILER_XCODE_TYPE sourcecode.c.c)
+ _cmake_find_compiler_path(C)
else()
if(NOT CMAKE_C_COMPILER)
set(CMAKE_C_COMPILER_INIT NOTFOUND)
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index d60cff3..ef8445e 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -41,6 +41,7 @@ endif()
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_CXX_COMPILER_XCODE_TYPE sourcecode.cpp.cpp)
+ _cmake_find_compiler_path(CXX)
else()
if(NOT CMAKE_CXX_COMPILER)
set(CMAKE_CXX_COMPILER_INIT NOTFOUND)
diff --git a/Modules/CMakeDetermineFortranCompiler.cmake
b/Modules/CMakeDetermineFortranCompiler.cmake
index f4aaa0a..d38bf25 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -28,6 +28,7 @@ endif()
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
set(CMAKE_Fortran_COMPILER_XCODE_TYPE sourcecode.fortran.f90)
+ _cmake_find_compiler_path(Fortran)
else()
if(NOT CMAKE_Fortran_COMPILER)
# prefer the environment variable CC
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6852fb8034d30d14498dc874378881696a6ada23
commit 6852fb8034d30d14498dc874378881696a6ada23
Author: Brad King
AuthorDate: Mon Mar 10 16:51:41 2014 -0400
Commit: Brad King
CommitDate: Mon Mar 10 17:12:00 2014 -0400
CMakeDetermine*Compiler: Factor out search for compiler in PATH
Factor out a _cmake_find_compiler_path helper macro to avoid duplication
of the search for a full path to the compiler.
diff --git a/Modules/CMakeDetermineASMCompiler.cmake
b/Modules/CMakeDetermineASMCompiler.cmake
index ca7eb8b..1d9617f 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -48,22 +48,7 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
_cmake_find_compiler(ASM${ASM_DIALECT})
else()
-
- # we only get here if CMAKE_ASM${ASM_DIALECT}_COMPILER was specified using
-D or a pre-made CMakeCache.txt
- # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
- #
- # if a compiler was specified by the user but without path,
- # now try to find it with the full path
- # if it is found, force it into the cache,
- # if not, don't overwrite the setting (which was given by the user) with
"NOTFOUND"
- get_filename_component(_CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH
"${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH)
- if(NOT _CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH)
-find_program(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH NAMES
${CMAKE_ASM${ASM_DIALECT}_COMPILER})
-if(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH)
- set(CMAKE_ASM${ASM_DIALECT}_COMPILER
${CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH} CACHE FILEPATH "Assembler" FORCE)
-
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-809-gefb4d85
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 efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd (commit) via 31a8e3f5c1a1773e6bae1a0dbf87af6b58d6c5d2 (commit) from 44ccdac0d64b132610f6d82397e3f1837015ef7c (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=efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd commit efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd Merge: 44ccdac 31a8e3f Author: Clinton Stimpson AuthorDate: Tue Mar 11 08:31:16 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Mar 11 08:31:16 2014 -0400 Merge topic 'configure_file-unicode' into next 31a8e3f5 Unicode: To bootstrap error, add KWSys FStream. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31a8e3f5c1a1773e6bae1a0dbf87af6b58d6c5d2 commit 31a8e3f5c1a1773e6bae1a0dbf87af6b58d6c5d2 Author: Clinton Stimpson AuthorDate: Tue Mar 11 06:30:18 2014 -0600 Commit: Clinton Stimpson CommitDate: Tue Mar 11 06:30:18 2014 -0600 Unicode: To bootstrap error, add KWSys FStream. diff --git a/bootstrap b/bootstrap index 69dcbce..4e61f3e 100755 --- a/bootstrap +++ b/bootstrap @@ -329,6 +329,7 @@ fi KWSYS_CXX_SOURCES="\ Directory \ EncodingCXX \ + FStream \ Glob \ RegularExpression \ SystemTools" --- Summary of changes: bootstrap |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-805-g71dc29a
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 71dc29aa75161ee690701ab70aaa39bd29215ad1 (commit)
via a20820fbfe862abd11fcec6fa293ddca94dfdb40 (commit)
from 6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae (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=71dc29aa75161ee690701ab70aaa39bd29215ad1
commit 71dc29aa75161ee690701ab70aaa39bd29215ad1
Merge: 6110d7b a20820f
Author: Stephen Kelly
AuthorDate: Tue Mar 11 03:48:54 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 11 03:48:54 2014 -0400
Merge topic 'remove-c_str-calls' into next
a20820fb Fix line length.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a20820fbfe862abd11fcec6fa293ddca94dfdb40
commit a20820fbfe862abd11fcec6fa293ddca94dfdb40
Author: Stephen Kelly
AuthorDate: Tue Mar 11 08:47:40 2014 +0100
Commit: Stephen Kelly
CommitDate: Tue Mar 11 08:47:40 2014 +0100
Fix line length.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index c337e10..14b2a1a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -393,7 +393,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
const std::string &lang) const
{
const char *compilerId = context->Makefile ?
- context->Makefile->GetSafeDefinition("CMAKE_" +
lang + "_COMPILER_ID") : "";
+ context->Makefile->GetSafeDefinition(
+ "CMAKE_" + lang + "_COMPILER_ID") : "";
if (parameters.size() == 0)
{
return compilerId ? compilerId : "";
@@ -499,7 +500,8 @@ struct CompilerVersionNode : public
cmGeneratorExpressionNode
const std::string &lang) const
{
const char *compilerVersion = context->Makefile ?
- context->Makefile->GetSafeDefinition("CMAKE_" +
lang + "_COMPILER_VERSION") : "";
+ context->Makefile->GetSafeDefinition(
+ "CMAKE_" + lang + "_COMPILER_VERSION") : "";
if (parameters.size() == 0)
{
return compilerVersion ? compilerVersion : "";
---
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
