[Cmake-commits] CMake branch, master, updated. v2.8.12.1-891-g6f6eec1
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 6f6eec1ff69ef9521710a30c749bfb0286752d59 (commit) from 8ee6f3199a22b2602083f3cf6090c2a1cfdf67ed (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=6f6eec1ff69ef9521710a30c749bfb0286752d59 commit 6f6eec1ff69ef9521710a30c749bfb0286752d59 Author: Kitware Robot AuthorDate: Sat Dec 7 00:01:10 2013 -0500 Commit: Kitware Robot CommitDate: Sat Dec 7 00:01:10 2013 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4b8a9ec..1227df3 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) -set(CMake_VERSION_TWEAK 20131206) +set(CMake_VERSION_TWEAK 20131207) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 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. v2.8.12.1-6103-gdf3e565
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 df3e56586d47d1317be3115e068080fbc6436ee0 (commit)
via 5b992018cf7c51c57068edf4b965eab4d65c76ba (commit)
from 5b76b26287946fbbdc38f8b973d63746c7ad0f76 (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=df3e56586d47d1317be3115e068080fbc6436ee0
commit df3e56586d47d1317be3115e068080fbc6436ee0
Merge: 5b76b26 5b99201
Author: Zack Galbreath
AuthorDate: Fri Dec 6 17:06:19 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 17:06:19 2013 -0500
Merge topic 'vtk-contract' into next
5b99201 fix failing VTK Contract test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b992018cf7c51c57068edf4b965eab4d65c76ba
commit 5b992018cf7c51c57068edf4b965eab4d65c76ba
Author: Zack Galbreath
AuthorDate: Fri Dec 6 17:02:56 2013 -0500
Commit: Zack Galbreath
CommitDate: Fri Dec 6 17:05:03 2013 -0500
fix failing VTK Contract test
This test was failing because it was attempting to build VTK in the
wrong directory.
diff --git a/Tests/Contracts/VTK/CMakeLists.txt
b/Tests/Contracts/VTK/CMakeLists.txt
index 5b19f01..ef19325 100644
--- a/Tests/Contracts/VTK/CMakeLists.txt
+++ b/Tests/Contracts/VTK/CMakeLists.txt
@@ -25,7 +25,6 @@ if(NOT DEFINED HOME)
endif()
set(base_dir "${HOME}/.cmake/Contracts/VTK")
-set(stamp_dir "${base_dir}/stamp")
if(NOT DEFINED SITE)
site_name(SITE)
@@ -41,7 +40,7 @@ configure_file(
ExternalProject_Add(${PROJECT_NAME}
GIT_REPOSITORY "git://vtk.org/VTK.git"
GIT_TAG "release"
- STAMP_DIR ${stamp_dir}
+ PREFIX ${base_dir}
CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_CTEST_COMMAND} -S "${base_dir}/Dashboard.cmake"
INSTALL_COMMAND ""
diff --git a/Tests/Contracts/VTK/Dashboard.cmake.in
b/Tests/Contracts/VTK/Dashboard.cmake.in
index b10f384..e33a2de 100644
--- a/Tests/Contracts/VTK/Dashboard.cmake.in
+++ b/Tests/Contracts/VTK/Dashboard.cmake.in
@@ -1,7 +1,7 @@
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "Contracts.VTK")
set(CTEST_DASHBOARD_ROOT "@base_dir@")
-set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/VTK")
+set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/src/VTK")
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/VTK-build")
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
@@ -24,5 +24,5 @@ file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
ctest_start(Nightly)
ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}")
ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
-ctest_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE "PythonSmoke")
+ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE "PythonSmoke")
ctest_submit(BUILD "${CTEST_BINARY_DIRECTORY}")
---
Summary of changes:
Tests/Contracts/VTK/CMakeLists.txt |3 +--
Tests/Contracts/VTK/Dashboard.cmake.in |4 ++--
2 files changed, 3 insertions(+), 4 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. v2.8.12.1-6101-g5b76b26
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 5b76b26287946fbbdc38f8b973d63746c7ad0f76 (commit)
via fc748185f49a4685f860a4f27f11b06ab94ff656 (commit)
via e324c587b00c518799ee6a5cbf25809fa1bb0475 (commit)
from 2ecbca00a52d5b97c8cb843b3752aec0e544612b (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=5b76b26287946fbbdc38f8b973d63746c7ad0f76
commit 5b76b26287946fbbdc38f8b973d63746c7ad0f76
Merge: 2ecbca0 fc74818
Author: Brad King
AuthorDate: Fri Dec 6 15:56:59 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 15:56:59 2013 -0500
Merge topic 'ExternalProject-independent-step-targets' into next
fc74818 ExternalProject: Fix tests with ninja
e324c58 ExternalProject: Add independent step targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc748185f49a4685f860a4f27f11b06ab94ff656
commit fc748185f49a4685f860a4f27f11b06ab94ff656
Author: Daniele E. Domenichelli
AuthorDate: Thu Dec 5 09:58:22 2013 +0100
Commit: Brad King
CommitDate: Fri Dec 6 15:54:46 2013 -0500
ExternalProject: Fix tests with ninja
Update step for external projects depending on "SetupLocal*Repository"
is not supposed to be independent, otherwise with parallel builds the
update step might be executed before the repository is ready.
diff --git a/Tests/ExternalProject/CMakeLists.txt
b/Tests/ExternalProject/CMakeLists.txt
index e22d84a..b4dca29 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -309,6 +309,7 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalCVSRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
@@ -324,6 +325,7 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalCVSRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
@@ -344,6 +346,7 @@ if(do_cvs_tests)
DEPENDS "TutorialStep1-LocalNoDirTGZ"
DEPENDS "TutorialStep1-CVS-20090626"
DEPENDS "TutorialStep1-CVS-testtag1"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
endif()
@@ -405,6 +408,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -419,6 +423,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -431,6 +436,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
+INDEPENDENT_STEP_TARGETS ""
LOG_DOWNLOAD 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -485,6 +491,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -499,6 +506,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -511,6 +519,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
+INDEPENDENT_STEP_TARGETS ""
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -551,6 +560,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
@@ -565,6 +575,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
+INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
@@ -580,6 +591,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
+ INDEPENDENT_STEP_TARGETS ""
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e324c587b00c518799ee6a5cbf25809fa1bb0475
commit e324c587b00c518799ee6a5cbf25809f
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6098-g2ecbca0
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 2ecbca00a52d5b97c8cb843b3752aec0e544612b (commit) via 8ee6f3199a22b2602083f3cf6090c2a1cfdf67ed (commit) from db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8 (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=2ecbca00a52d5b97c8cb843b3752aec0e544612b commit 2ecbca00a52d5b97c8cb843b3752aec0e544612b Merge: db605f8 8ee6f31 Author: Brad King AuthorDate: Fri Dec 6 15:53:04 2013 -0500 Commit: Brad King CommitDate: Fri Dec 6 15:53:04 2013 -0500 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. v2.8.12.1-890-g8ee6f31
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 8ee6f3199a22b2602083f3cf6090c2a1cfdf67ed (commit) via ef7c11ee31b371bd07bc32991a671da757602213 (commit) from ce598cc838c717132a122a97c5e21b99f11fe23b (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=8ee6f3199a22b2602083f3cf6090c2a1cfdf67ed commit 8ee6f3199a22b2602083f3cf6090c2a1cfdf67ed Merge: ce598cc ef7c11e Author: Brad King AuthorDate: Fri Dec 6 15:52:41 2013 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 6 15:52:41 2013 -0500 Merge topic 'cleanup-build-commands' ef7c11e Tests: Fix standalone build of tests with nested projects --- Summary of changes: Tests/ExportImport/CMakeLists.txt |3 +++ Tests/Fortran/CMakeLists.txt|4 Tests/MacRuntimePath/CMakeLists.txt |4 +++- 3 files changed, 10 insertions(+), 1 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. v2.8.12.1-6096-gdb605f8
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 db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8 (commit)
via de56e933a7f79e77455f796945d7d3f14b7a5cd7 (commit)
via c122104dc1d4c47eb71e748c81370a4d52a09c1e (commit)
from f5631b5b50e2e543c32c1a2d3d347600753bd20a (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=db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8
commit db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8
Merge: f5631b5 de56e93
Author: Brad King
AuthorDate: Fri Dec 6 15:48:28 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 15:48:28 2013 -0500
Merge topic 'revert-two-topics' into next
de56e93 Revert two topics to untangle them
c122104 Merge topic 'CMakeParseArguments_EmptyArgs' into revert-two-topics
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de56e933a7f79e77455f796945d7d3f14b7a5cd7
commit de56e933a7f79e77455f796945d7d3f14b7a5cd7
Author: Brad King
AuthorDate: Fri Dec 6 15:44:58 2013 -0500
Commit: Brad King
CommitDate: Fri Dec 6 15:46:32 2013 -0500
Revert two topics to untangle them
Revert topics ExternalProject-independent-step-targets and
CMakeParseArguments_EmptyArgs.
diff --git a/Modules/CMakeParseArguments.cmake
b/Modules/CMakeParseArguments.cmake
index de3f164..4248176 100644
--- a/Modules/CMakeParseArguments.cmake
+++ b/Modules/CMakeParseArguments.cmake
@@ -2,23 +2,16 @@
# CMakeParseArguments
# ---
#
-# Parse arguments given to a macro or a function.
#
-# cmake_parse_arguments() is intended to be used in macros or functions
+#
+# CMAKE_PARSE_ARGUMENTS(
+# args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions
# for parsing the arguments given to that macro or function. It
# processes the arguments and defines a set of variables which hold the
# values of the respective options.
#
-# ::
-#
-# cmake_parse_arguments(
-#
-#
-#
-#
[CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY|CMAKE_PARSE_ARGUMENTS_KEEP_EMPTY]
-#args...
-#)
-#
# The argument contains all options for the respective macro,
# i.e. keywords which can be used when calling the macro without any
# value following, like e.g. the OPTIONAL keyword of the install()
@@ -32,7 +25,7 @@
# macro which can be followed by more than one value, like e.g. the
# TARGETS or FILES keywords of the install() command.
#
-# When done, cmake_parse_arguments() will have defined for each of the
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
# keywords listed in , and
# a variable composed of the given
# followed by "_" and the name of the respective keyword. These
@@ -43,17 +36,6 @@
# _UNPARSED_ARGUMENTS, this can be checked afterwards to see
# whether your macro was called with unrecognized parameters.
#
-# The cmake CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY (old behaviour) and
-# CMAKE_PARSE_ARGUMENTS_KEEP_EMPTY options decide how empty arguments
-# should be handled. If none of these options is set, for backwards
-# compatibility, if CMAKE_MINIMUM_REQUIRED_VERSION < 3.0.0, the default
-# behaviour is to skip empty arguments, otherwise the default behaviour
-# is to keep them. Using the CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
-# variable the user can explicitly set the default behaviour in current
-# scope.
-#
-#
-#
# As an example here a my_install() macro, which takes similar arguments
# as the real install() command:
#
@@ -63,7 +45,7 @@
# set(options OPTIONAL FAST)
# set(oneValueArgs DESTINATION RENAME)
# set(multiValueArgs TARGETS CONFIGURATIONS)
-# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}"
"${multiValueArgs}" "${ARGN}" )
+# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN} )
# ...
#
#
@@ -98,42 +80,7 @@
# interpreted as the beginning of the new option. E.g.
# my_install(TARGETS foo DESTINATION OPTIONAL) would result in
# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION
-# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore.
-#
-#
-#
-# If the "CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY" option is set,
-# cmake_parse_argumentswill not consider empty arguments.
-# Therefore
-#
-# ::
-#
-#my_install(DESTINATION "" TARGETS foo "" bar)
-#
-# Will set
-#
-# ::
-#
-#MY_INSTALL_DESTINATION = (unset)
-#MY_INSTALL_MULTI = "foo;bar"
-#
-# Using the "CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY" option instead, will set
-#
-# ::
-#
-#M
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6093-gf5631b5
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 f5631b5b50e2e543c32c1a2d3d347600753bd20a (commit)
via 283c0a7e3ca857fb7ef6dabc72faffadc609c200 (commit)
from a08972e3d6d9639efa86814e0400f8d3f2512a27 (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=f5631b5b50e2e543c32c1a2d3d347600753bd20a
commit f5631b5b50e2e543c32c1a2d3d347600753bd20a
Merge: a08972e 283c0a7
Author: Brad King
AuthorDate: Fri Dec 6 15:14:31 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 15:14:31 2013 -0500
Merge topic 'unicode-win32-apis' into next
283c0a7 cmFindPackageCommand: Fix RegEnumValueW data size computation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=283c0a7e3ca857fb7ef6dabc72faffadc609c200
commit 283c0a7e3ca857fb7ef6dabc72faffadc609c200
Author: Brad King
AuthorDate: Fri Dec 6 15:10:16 2013 -0500
Commit: Brad King
CommitDate: Fri Dec 6 15:10:16 2013 -0500
cmFindPackageCommand: Fix RegEnumValueW data size computation
RegEnumValue returns ERROR_MORE_DATA if lpcchValueName is larger
than 32767 _bytes_, so reduce our name[] size to fit within that.
Also update the lpcbData argument and ERROR_MORE_DATA handling
to work with the size of the lpData buffer in bytes, not elements.
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index b9ee8be..55c20d6 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1254,14 +1254,14 @@ void cmFindPackageCommand::LoadPackageRegistryWin(bool
user,
0, KEY_QUERY_VALUE|view, &hKey) == ERROR_SUCCESS)
{
DWORD valueType = REG_NONE;
-wchar_t name[16384];
+wchar_t name[16383]; // RegEnumValue docs limit name to 32767 _bytes_
std::vector data(512);
bool done = false;
DWORD index = 0;
while(!done)
{
DWORD nameSize = static_cast(sizeof(name));
- DWORD dataSize = static_cast(data.size()-1);
+ DWORD dataSize = static_cast(data.size()*sizeof(data[0]));
switch(RegEnumValueW(hKey, index, name, &nameSize,
0, &valueType, (BYTE*)&data[0], &dataSize))
{
@@ -1279,7 +1279,7 @@ void cmFindPackageCommand::LoadPackageRegistryWin(bool
user,
}
break;
case ERROR_MORE_DATA:
- data.resize(dataSize+1);
+ data.resize((dataSize+sizeof(data[0])-1)/sizeof(data[0]));
break;
case ERROR_NO_MORE_ITEMS: default: done = true; break;
}
---
Summary of changes:
Source/cmFindPackageCommand.cxx |6 +++---
1 files 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, next, updated. v2.8.12.1-6091-ga08972e
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 a08972e3d6d9639efa86814e0400f8d3f2512a27 (commit) via 237d1da083feef81280b75dca26cf3a1957d55a6 (commit) from 5cd09b1ad4ee62c6804767889aa65e58ce0f4733 (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=a08972e3d6d9639efa86814e0400f8d3f2512a27 commit a08972e3d6d9639efa86814e0400f8d3f2512a27 Merge: 5cd09b1 237d1da Author: Daniele E. Domenichelli AuthorDate: Fri Dec 6 14:59:11 2013 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 6 14:59:11 2013 -0500 Merge topic 'ExternalProject-independent-step-targets' into next 237d1da ExternalProject: Fix commit f098870551d156f233c8637219daeb8e1a372cf4 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=237d1da083feef81280b75dca26cf3a1957d55a6 commit 237d1da083feef81280b75dca26cf3a1957d55a6 Author: Daniele E. Domenichelli AuthorDate: Fri Dec 6 20:57:00 2013 +0100 Commit: Daniele E. Domenichelli CommitDate: Fri Dec 6 20:57:00 2013 +0100 ExternalProject: Fix commit f098870551d156f233c8637219daeb8e1a372cf4 diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake index fe7f509..57626d6 100644 --- a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake +++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake @@ -8,7 +8,7 @@ ExternalProject_Add(FOO URL https://example.org/foo.tar.gz) ExternalProject_Add(BAR -URL https://example.org/bar.tar.git +URL https://example.org/bar.tar.gz TEST_COMMAND echo test INDEPENDENT_STEP_TARGETS install) # This one should not give a warning --- Summary of changes: Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake |2 +- 1 files changed, 1 insertions(+), 1 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. v2.8.12.1-6089-g5cd09b1
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 5cd09b1ad4ee62c6804767889aa65e58ce0f4733 (commit)
via 2a919461d56ebe8dc6ba3238ca86624f633e184d (commit)
from 940af6eab5ae7a41af12b75cf413955c611151e4 (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=5cd09b1ad4ee62c6804767889aa65e58ce0f4733
commit 5cd09b1ad4ee62c6804767889aa65e58ce0f4733
Merge: 940af6e 2a91946
Author: Clinton Stimpson
AuthorDate: Fri Dec 6 11:49:51 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 11:49:51 2013 -0500
Merge topic 'unicode-win32-apis' into next
2a91946 style: Fix line length warning.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a919461d56ebe8dc6ba3238ca86624f633e184d
commit 2a919461d56ebe8dc6ba3238ca86624f633e184d
Author: Clinton Stimpson
AuthorDate: Fri Dec 6 09:48:55 2013 -0700
Commit: Clinton Stimpson
CommitDate: Fri Dec 6 09:48:55 2013 -0700
style: Fix line length warning.
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 1ced9ef..0a67ccf 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -287,7 +287,7 @@ void cmExportCommand::StorePackageRegistryWin(std::string
const& package,
std::wstring wcontent = cmsys::Encoding::ToWide(content);
err = RegSetValueExW(hKey, cmsys::Encoding::ToWide(hash).c_str(),
0, REG_SZ, (BYTE const*)wcontent.c_str(),
- static_cast(wcontent.size()+1) *
sizeof(wchar_t));
+ static_cast(wcontent.size()+1)*sizeof(wchar_t));
RegCloseKey(hKey);
if(err != ERROR_SUCCESS)
{
---
Summary of changes:
Source/cmExportCommand.cxx |2 +-
1 files changed, 1 insertions(+), 1 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. v2.8.12.1-6087-g940af6e
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 940af6eab5ae7a41af12b75cf413955c611151e4 (commit)
via c61fb835caf3515dd6c6435f4e262c7e85490700 (commit)
from edb2bfce914b4cdacda4474f2b01a8ef146dc8aa (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=940af6eab5ae7a41af12b75cf413955c611151e4
commit 940af6eab5ae7a41af12b75cf413955c611151e4
Merge: edb2bfc c61fb83
Author: Clinton Stimpson
AuthorDate: Fri Dec 6 10:35:48 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 10:35:48 2013 -0500
Merge topic 'unicode-win32-apis' into next
c61fb83 Replace current Win32 apis calls with wide version.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c61fb835caf3515dd6c6435f4e262c7e85490700
commit c61fb835caf3515dd6c6435f4e262c7e85490700
Author: Clinton Stimpson
AuthorDate: Wed Dec 4 22:17:24 2013 -0700
Commit: Clinton Stimpson
CommitDate: Fri Dec 6 08:34:50 2013 -0700
Replace current Win32 apis calls with wide version.
CMake now compiles if /DUNICODE is defined.
These changes also make it possible for the 8 bit encoding
to eventually be utf-8 instead ANSI.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 91701c2..1b9b20a 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include // for GUID generation
@@ -954,11 +955,12 @@ std::string cmCPackWIXGenerator::GenerateGUID()
UUID guid;
UuidCreate(&guid);
- unsigned char *tmp = 0;
- UuidToString(&guid, &tmp);
+ unsigned short *tmp = 0;
+ UuidToStringW(&guid, &tmp);
- std::string result(reinterpret_cast(tmp));
- RpcStringFree(&tmp);
+ std::string result =
+cmsys::Encoding::ToNarrow(reinterpret_cast(tmp));
+ RpcStringFreeW(&tmp);
return cmSystemTools::UpperCase(result);
}
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 3f6bc2e..1ced9ef 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -16,6 +16,7 @@
#include "cmake.h"
#include
+#include
#include "cmExportBuildFileGenerator.h"
@@ -252,14 +253,14 @@ void cmExportCommand::ReportRegistryError(std::string
const& msg,
cmOStringStream e;
e << msg << "\n"
<< " HKEY_CURRENT_USER\\" << key << "\n";
- char winmsg[1024];
- if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+ wchar_t winmsg[1024];
+ if(FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, 0, err,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
winmsg, 1024, 0) > 0)
{
e << "Windows reported:\n"
- << " " << winmsg;
+ << " " << cmsys::Encoding::ToNarrow(winmsg);
}
this->Makefile->IssueMessage(cmake::WARNING, e.str());
}
@@ -272,8 +273,9 @@ void cmExportCommand::StorePackageRegistryWin(std::string
const& package,
std::string key = "Software\\Kitware\\CMake\\Packages\\";
key += package;
HKEY hKey;
- LONG err = RegCreateKeyEx(HKEY_CURRENT_USER,
-key.c_str(), 0, 0, REG_OPTION_NON_VOLATILE,
+ LONG err = RegCreateKeyExW(HKEY_CURRENT_USER,
+cmsys::Encoding::ToWide(key).c_str(),
+0, 0, REG_OPTION_NON_VOLATILE,
KEY_SET_VALUE, 0, &hKey, 0);
if(err != ERROR_SUCCESS)
{
@@ -281,8 +283,11 @@ void cmExportCommand::StorePackageRegistryWin(std::string
const& package,
"Cannot create/open registry key", key, err);
return;
}
- err = RegSetValueEx(hKey, hash, 0, REG_SZ, (BYTE const*)content,
- static_cast(strlen(content)+1));
+
+ std::wstring wcontent = cmsys::Encoding::ToWide(content);
+ err = RegSetValueExW(hKey, cmsys::Encoding::ToWide(hash).c_str(),
+ 0, REG_SZ, (BYTE const*)wcontent.c_str(),
+ static_cast(wcontent.size()+1) *
sizeof(wchar_t));
RegCloseKey(hKey);
if(err != ERROR_SUCCESS)
{
diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx
index 3167be4..02f10c0 100644
--- a/Source/cmFileTimeComparison.cxx
+++ b/Source/cmFileTimeComparison.cxx
@@ -16,6 +16,8 @@
# include
#endif
+#include
+
// Use a platform-specific API to get file times efficiently.
#if !defined(_WIN32) || defined(__CYGWIN__)
# define cmFileTimeComparison_Type struct stat
@@ -86,7 +88,8 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname,
// Windows version. Get the modification time from extended file
/
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6085-gedb2bfc
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 edb2bfce914b4cdacda4474f2b01a8ef146dc8aa (commit)
via 05c518b3dee430b56a090e34b55c3f8dbfd034d4 (commit)
from 282b19d8738c7591f727a4f3d24320c0c3a83c1b (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=edb2bfce914b4cdacda4474f2b01a8ef146dc8aa
commit edb2bfce914b4cdacda4474f2b01a8ef146dc8aa
Merge: 282b19d 05c518b
Author: Clinton Stimpson
AuthorDate: Fri Dec 6 10:08:44 2013 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 6 10:08:44 2013 -0500
Merge topic 'qt4-qmake-exe' into next
05c518b FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE
properly.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05c518b3dee430b56a090e34b55c3f8dbfd034d4
commit 05c518b3dee430b56a090e34b55c3f8dbfd034d4
Author: Simon Sasburg
AuthorDate: Thu Dec 5 22:21:03 2013 +
Commit: Clinton Stimpson
CommitDate: Fri Dec 6 08:07:38 2013 -0700
FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
This fixes a regression in commit 21123416 where it was trying to better
handle
a qmake from Qt5.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 46a0355..24747f7 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -738,6 +738,11 @@ _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE
QTVERSION)
if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+ if (QT_QMAKE_EXECUTABLE_LAST)
+string(COMPARE NOTEQUAL "${QT_QMAKE_EXECUTABLE_LAST}"
"${QT_QMAKE_EXECUTABLE}" QT_QMAKE_CHANGED)
+ endif()
+ set(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL ""
FORCE)
+
_qt4_get_version_components("${QTVERSION}" QT_VERSION_MAJOR QT_VERSION_MINOR
QT_VERSION_PATCH)
# ask qmake for the mkspecs directory
---
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. v2.8.12.1-6083-g282b19d
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 282b19d8738c7591f727a4f3d24320c0c3a83c1b (commit) via 5da1580adaa0b7ccf5f3a6afac5e9cae615ca163 (commit) via ce598cc838c717132a122a97c5e21b99f11fe23b (commit) from 9dfac4695e4d83b19af0169e775b8b401adc0503 (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=282b19d8738c7591f727a4f3d24320c0c3a83c1b commit 282b19d8738c7591f727a4f3d24320c0c3a83c1b Merge: 9dfac46 5da1580 Author: Brad King AuthorDate: Fri Dec 6 09:07:36 2013 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 6 09:07:36 2013 -0500 Merge topic 'mingw-gfortran-sizeof-dptr' into next 5da1580 Fortran: Improve pointer size detection in gfortran on MinGW ce598cc CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5da1580adaa0b7ccf5f3a6afac5e9cae615ca163 commit 5da1580adaa0b7ccf5f3a6afac5e9cae615ca163 Author: Brad King AuthorDate: Fri Dec 6 09:01:32 2013 -0500 Commit: Brad King CommitDate: Fri Dec 6 09:02:27 2013 -0500 Fortran: Improve pointer size detection in gfortran on MinGW In commit ecd84147 (Fortran: Detect pointer size in gfortran on MinGW, 2011-11-29) we started testing for __SIZEOF_POINTER__ but not all GNU Fortran compilers define this. Check also for __SIZEOF_SIZE_T__ which at least one version of gfortran defines without also defining __SIZEOF_POINTER__. diff --git a/Modules/CMakeFortranCompilerABI.F b/Modules/CMakeFortranCompilerABI.F index 7e24553..21ca7ff 100644 --- a/Modules/CMakeFortranCompilerABI.F +++ b/Modules/CMakeFortranCompilerABI.F @@ -20,6 +20,10 @@ PRINT *, 'INFO:sizeof_dptr[8]' #elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4 PRINT *, 'INFO:sizeof_dptr[4]' +#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 8 +PRINT *, 'INFO:sizeof_dptr[8]' +#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 4 +PRINT *, 'INFO:sizeof_dptr[4]' #endif #if 0 --- Summary of changes: Modules/CMakeFortranCompilerABI.F |4 Source/CMakeVersion.cmake |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
