[Cmake-commits] CMake branch, next, updated. v3.2.1-1232-gc8631b5
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 c8631b528e702c5dd11fe5a41ee7e9972caa24c9 (commit) via a8e7a1047ad3b61238f073ea3d2cd138f207c1ed (commit) from 6450c758c809b4f597af8cac9d9c8f052931953a (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=c8631b528e702c5dd11fe5a41ee7e9972caa24c9 commit c8631b528e702c5dd11fe5a41ee7e9972caa24c9 Merge: 6450c75 a8e7a10 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Mar 26 09:34:08 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Mar 26 09:34:08 2015 -0400 Merge topic 'Fortran-GNU-no-isystem' into next a8e7a104 GNU: Do not use -isystem with gfortran http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8e7a1047ad3b61238f073ea3d2cd138f207c1ed commit a8e7a1047ad3b61238f073ea3d2cd138f207c1ed Author: Brad King brad.k...@kitware.com AuthorDate: Thu Mar 26 09:32:39 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Mar 26 09:33:20 2015 -0400 GNU: Do not use -isystem with gfortran The compiler documents that USE statements search for .mod files in directories specified with -I, but not -isystem. Reported-by: Hugh Sorby h.so...@auckland.ac.nz diff --git a/Modules/Compiler/GNU-Fortran.cmake b/Modules/Compiler/GNU-Fortran.cmake index dfd7927..e9c8a59 100644 --- a/Modules/Compiler/GNU-Fortran.cmake +++ b/Modules/Compiler/GNU-Fortran.cmake @@ -8,5 +8,8 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG -ffree-form) set(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT -Os) set(CMAKE_Fortran_FLAGS_RELEASE_INIT -O3) +# No -isystem for Fortran because it will not find .mod files. +unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) + # Fortran-specific feature flags. set(CMAKE_Fortran_MODDIR_FLAG -J) --- Summary of changes: Modules/Compiler/GNU-Fortran.cmake |3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1230-g6450c75
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 6450c758c809b4f597af8cac9d9c8f052931953a (commit)
via dcf298008f60fa00ddcb225b7a474317ad4d317f (commit)
from 93b7164a34f40d60dbfd625d0aa90b55304ed34f (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=6450c758c809b4f597af8cac9d9c8f052931953a
commit 6450c758c809b4f597af8cac9d9c8f052931953a
Merge: 93b7164 dcf2980
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Mar 26 09:02:25 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 09:02:25 2015 -0400
Merge topic 'FindMFC-CMP0054' into next
dcf29800 FindMFC: Use if(DEFINED) to simplify condition (#15477)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf298008f60fa00ddcb225b7a474317ad4d317f
commit dcf298008f60fa00ddcb225b7a474317ad4d317f
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Mar 26 09:00:32 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Mar 26 09:02:05 2015 -0400
FindMFC: Use if(DEFINED) to simplify condition (#15477)
Replace an old hack of the form 'if(${VAR} MATCHES ^${VAR}$)'
with the much simpler 'if(NOT DEFINED ${VAR})'. This was exposed
by a CMP0054 warning.
diff --git a/Modules/FindMFC.cmake b/Modules/FindMFC.cmake
index 261ebdb..3547628 100644
--- a/Modules/FindMFC.cmake
+++ b/Modules/FindMFC.cmake
@@ -36,7 +36,7 @@ if(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW)
endif()
if(MFC_ATTEMPT_TRY_COMPILE)
- if(MFC_HAVE_MFC MATCHES ^MFC_HAVE_MFC$)
+ if(NOT DEFINED MFC_HAVE_MFC)
set(CHECK_INCLUDE_FILE_VAR afxwin.h)
configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
---
Summary of changes:
Modules/FindMFC.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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1245-gadfa972
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 adfa97275e880a785d9611a60af9df9591fe4af0 (commit)
via 7fea419624386df1d36688f687725b5624de5db8 (commit)
from f19528014b75129c08d5749239c86b2ceabaa6b7 (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=adfa97275e880a785d9611a60af9df9591fe4af0
commit adfa97275e880a785d9611a60af9df9591fe4af0
Merge: f195280 7fea419
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 27 00:06:11 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 27 00:06:11 2015 -0400
Merge topic 'cpack-archive-prefix' into next
7fea4196 Fix KWStyle test failure.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fea419624386df1d36688f687725b5624de5db8
commit 7fea419624386df1d36688f687725b5624de5db8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 22:05:41 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 26 22:05:41 2015 -0600
Fix KWStyle test failure.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index b42a35e..05b5cd9 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -63,7 +63,8 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
filePrefix = this-GetOption(CPACK_PACKAGE_FILE_NAME);
filePrefix += /;
}
- const char* installPrefix =
this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
+ const char* installPrefix =
+this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
if(installPrefix installPrefix[0] == '/' installPrefix[1] != 0)
{
// add to file prefix and remove the leading '/'
---
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1247-gdf5c75d
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 df5c75d49d76488736841fe6e3bde1f4d85b0ece (commit)
via 798582d0018ee501e0091d4ae1315d3d1b000ca2 (commit)
from adfa97275e880a785d9611a60af9df9591fe4af0 (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=df5c75d49d76488736841fe6e3bde1f4d85b0ece
commit df5c75d49d76488736841fe6e3bde1f4d85b0ece
Merge: adfa972 798582d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 27 00:15:37 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 27 00:15:37 2015 -0400
Merge topic 'cpack-archive-prefix' into next
798582d0 Fix CPackComponentsPrefix test failure without NSIS.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=798582d0018ee501e0091d4ae1315d3d1b000ca2
commit 798582d0018ee501e0091d4ae1315d3d1b000ca2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 22:14:07 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 26 22:14:07 2015 -0600
Fix CPackComponentsPrefix test failure without NSIS.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7135f5d..b47ea1b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1041,9 +1041,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
if(APPLE)
set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
endif()
-if(NSIS_MAKENSIS_EXECUTABLE)
+if(NOT NSIS_MAKENSIS_EXECUTABLE)
set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
--DCPACK_BINARY_NSIS:BOOL=ON)
+-DCPACK_BINARY_NSIS:BOOL=OFF)
endif()
add_test(CPackComponentsPrefix ${CMAKE_CTEST_COMMAND}
---
Summary of changes:
Tests/CMakeLists.txt |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.2.1-511-g685d179
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 685d179b8b8e0f0b98dbfd227f6ccd88b17749b0 (commit) from 5d1d995bb7a982b13d691f7a926e497f4c44d6f1 (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=685d179b8b8e0f0b98dbfd227f6ccd88b17749b0 commit 685d179b8b8e0f0b98dbfd227f6ccd88b17749b0 Author: Kitware Robot kwro...@kitware.com AuthorDate: Fri Mar 27 00:01:04 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Fri Mar 27 00:01:04 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index baf3b2b..999182f 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 2) -set(CMake_VERSION_PATCH 20150326) +set(CMake_VERSION_PATCH 20150327) #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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1241-ga7fe79c
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 a7fe79c03a8036edbb998809bd339cce2a0ac3f8 (commit) via 4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 (commit) from 5914c8133421a27f07e6c3d8a1112318cd163df3 (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=a7fe79c03a8036edbb998809bd339cce2a0ac3f8 commit a7fe79c03a8036edbb998809bd339cce2a0ac3f8 Merge: 5914c81 4a2ff2b Author: Brad King brad.k...@kitware.com AuthorDate: Thu Mar 26 14:07:34 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Mar 26 14:07:34 2015 -0400 Merge topic 'curl-cygwin-no-windows' into next 4a2ff2b7 curl: Never consider using Windows APIs on Cygwin http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 commit 4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Mar 26 14:01:03 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Mar 26 14:04:39 2015 -0400 curl: Never consider using Windows APIs on Cygwin Our Windows API header checks are conditioned on if(NOT UNIX) but libarchive checks HAVE_WINDOWS_H anyway so the result leaks into the cache and influenes the curl build. Set the check results to false explicitly for curl when not on Windows to tolerate this. Reported-by: Vyacheslav Karpukhin vyacheslav.karpuk...@jetbrains.com diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 08bdff5..32e4561 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -524,12 +524,18 @@ check_include_file(features.h HAVE_FEATURES_H) if(NOT UNIX) check_include_file_concat(ws2tcpip.h HAVE_WS2TCPIP_H) check_include_file_concat(winsock2.h HAVE_WINSOCK2_H) -endif(NOT UNIX) +else() + set(HAVE_WS2TCPIP_H 0) + set(HAVE_WINSOCK2_H 0) +endif() check_include_file_concat(stdio.h HAVE_STDIO_H) if(NOT UNIX) check_include_file_concat(windows.h HAVE_WINDOWS_H) check_include_file_concat(winsock.h HAVE_WINSOCK_H) -endif(NOT UNIX) +else() + set(HAVE_WINDOWS_H 0) + set(HAVE_WINSOCK_H 0) +endif() check_include_file_concat(inttypes.h HAVE_INTTYPES_H) check_include_file_concat(sys/filio.h HAVE_SYS_FILIO_H) --- Summary of changes: Utilities/cmcurl/CMakeLists.txt | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1234-g2d49fa7
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 2d49fa73f23f4591bd22370ee34340a575d02183 (commit)
via 34f2dff61d65681cc54366544336d6085fd463b4 (commit)
from c8631b528e702c5dd11fe5a41ee7e9972caa24c9 (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=2d49fa73f23f4591bd22370ee34340a575d02183
commit 2d49fa73f23f4591bd22370ee34340a575d02183
Merge: c8631b5 34f2dff
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 09:48:30 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 09:48:30 2015 -0400
Merge topic 'cpack-archive-prefix' into next
34f2dff6 cpack: Fix some test failures caused by 36f7cbca9
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34f2dff61d65681cc54366544336d6085fd463b4
commit 34f2dff61d65681cc54366544336d6085fd463b4
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 07:21:27 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 26 07:21:27 2015 -0600
cpack: Fix some test failures caused by 36f7cbca9
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 373170b..b42a35e 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -64,7 +64,7 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
filePrefix += /;
}
const char* installPrefix =
this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
- if(installPrefix installPrefix[0] == '/')
+ if(installPrefix installPrefix[0] == '/' installPrefix[1] != 0)
{
// add to file prefix and remove the leading '/'
filePrefix += installPrefix+1;
---
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1243-gf195280
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 f19528014b75129c08d5749239c86b2ceabaa6b7 (commit)
via a704098de83460e8e9bae02434a6c31e7fc3ffd7 (commit)
from a7fe79c03a8036edbb998809bd339cce2a0ac3f8 (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=f19528014b75129c08d5749239c86b2ceabaa6b7
commit f19528014b75129c08d5749239c86b2ceabaa6b7
Merge: a7fe79c a704098
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Mar 26 18:14:02 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 18:14:02 2015 -0400
Merge topic 'fix-external-project-generator' into next
a704098d ExternalProject: fix the build command for generator overrides
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a704098de83460e8e9bae02434a6c31e7fc3ffd7
commit a704098de83460e8e9bae02434a6c31e7fc3ffd7
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Mar 26 18:12:04 2015 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Mar 26 18:12:04 2015 -0400
ExternalProject: fix the build command for generator overrides
The `binary_dir` variable is never set, so this is invalid. Instead, use
. which all the other build commands use anyways. Also only set the
--config option if it is meaningful.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d7b985d..0c73d41 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1197,7 +1197,10 @@ function(_ep_get_build_command name step cmd_var)
else()
set(cmd ${CMAKE_COMMAND})
endif()
-set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR})
+set(args --build .)
+if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL .)
+ list(APPEND args --config ${CMAKE_CFG_INTDIR})
+endif ()
if(step STREQUAL INSTALL)
list(APPEND args --target install)
endif()
---
Summary of changes:
Modules/ExternalProject.cmake |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1236-g99052a9
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 99052a9ddb3e60dd978a79a17a0b4651219f (commit)
via e680d43d7dd96096962379f627828a182ac0fa80 (commit)
from 2d49fa73f23f4591bd22370ee34340a575d02183 (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=99052a9ddb3e60dd978a79a17a0b4651219f
commit 99052a9ddb3e60dd978a79a17a0b4651219f
Merge: 2d49fa7 e680d43
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Mar 26 11:43:14 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 11:43:14 2015 -0400
Merge topic 'clean-scanbuild-warnings' into next
e680d43d Fix an unused variable warning from scanbuild.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e680d43d7dd96096962379f627828a182ac0fa80
commit e680d43d7dd96096962379f627828a182ac0fa80
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Mar 26 11:05:56 2015 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Thu Mar 26 11:05:56 2015 -0400
Fix an unused variable warning from scanbuild.
diff --git a/Source/cmSetTestsPropertiesCommand.cxx
b/Source/cmSetTestsPropertiesCommand.cxx
index d079a19..e9cfacc 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -26,14 +26,12 @@ bool cmSetTestsPropertiesCommand
// first collect up the list of files
std::vectorstd::string propertyPairs;
- bool doingFiles = true;
int numFiles = 0;
std::vectorstd::string::const_iterator j;
for(j= args.begin(); j != args.end();++j)
{
if(*j == PROPERTIES)
{
- doingFiles = false;
// now loop through the rest of the arguments, new style
++j;
if (std::distance(j, args.end()) % 2 != 0)
@@ -44,15 +42,9 @@ bool cmSetTestsPropertiesCommand
propertyPairs.insert(propertyPairs.end(), j, args.end());
break;
}
-else if (doingFiles)
- {
- numFiles++;
- }
else
{
- this-SetError(called with illegal arguments, maybe
- missing a PROPERTIES specifier?);
- return false;
+ numFiles++;
}
}
if(propertyPairs.empty())
@@ -62,7 +54,6 @@ bool cmSetTestsPropertiesCommand
return false;
}
-
// now loop over all the targets
int i;
for(i = 0; i numFiles; ++i)
---
Summary of changes:
Source/cmSetTestsPropertiesCommand.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1239-g5914c81
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 5914c8133421a27f07e6c3d8a1112318cd163df3 (commit)
via 8603791553965de4d80a42347022dec1fbd8cd98 (commit)
via 5d1d995bb7a982b13d691f7a926e497f4c44d6f1 (commit)
from 99052a9ddb3e60dd978a79a17a0b4651219f (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=5914c8133421a27f07e6c3d8a1112318cd163df3
commit 5914c8133421a27f07e6c3d8a1112318cd163df3
Merge: 99052a9 8603791
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Mar 26 11:57:23 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 11:57:23 2015 -0400
Merge topic 'wix-external-expat' into next
86037915 CPackWIX: Add static_casts for XML_Parser.
5d1d995b CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8603791553965de4d80a42347022dec1fbd8cd98
commit 8603791553965de4d80a42347022dec1fbd8cd98
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Mar 26 16:56:44 2015 +0100
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Thu Mar 26 16:56:44 2015 +0100
CPackWIX: Add static_casts for XML_Parser.
XML_Parser in cmexpat is a typedef for void* while newer releases of
expat seem to use struct XML_ParserStruct *XML_Parser.
Add static_casts so that the build works with either variant.
diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx
b/Source/CPack/WiX/cmWIXPatchParser.cxx
index ef67b23..e066c28 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.cxx
+++ b/Source/CPack/WiX/cmWIXPatchParser.cxx
@@ -132,8 +132,8 @@ void cmWIXPatchParser::ReportError(int line, int column,
const char* msg)
void cmWIXPatchParser::ReportValidationError(std::string const message)
{
- ReportError(XML_GetCurrentLineNumber(Parser),
-XML_GetCurrentColumnNumber(Parser),
+ ReportError(XML_GetCurrentLineNumber(static_castXML_Parser(this-Parser)),
+XML_GetCurrentColumnNumber(static_castXML_Parser(this-Parser)),
message.c_str());
}
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/CPack/WiX/cmWIXPatchParser.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
