[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-84-ge3c5aed
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 e3c5aed6ae1b0dcdde51f5baea7f150395d21d9f (commit) from 785bfae867de0ad18463d618d45b4ae8c2712934 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3c5aed6ae1b0dcdde51f5baea7f150395d21d9f commit e3c5aed6ae1b0dcdde51f5baea7f150395d21d9f Author: Kitware Robot AuthorDate: Mon Oct 10 00:01:04 2016 -0400 Commit: Kitware Robot CommitDate: Mon Oct 10 00:01:04 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b28be44..da91b74 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 7) -set(CMake_VERSION_PATCH 20161009) +set(CMake_VERSION_PATCH 20161010) #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.7.0-rc1-309-ga27be19
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 a27be19f9c4990e97310c1fbf0005aaaf9bbf40e (commit)
via 326d5fa74781d807b9ecc2feed1b433657c3a92b (commit)
via 7d45db99563c83a1a85722b1ee0f1fe10f8967d3 (commit)
via a28b8f95bca8ac99c811fe24cd1e291330a1cd28 (commit)
via 66c6144cdafcae83fe4c36a4355a67aa69198809 (commit)
from c2382855e6a9706c9f71beb1f57bfafc75587f65 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a27be19f9c4990e97310c1fbf0005aaaf9bbf40e
commit a27be19f9c4990e97310c1fbf0005aaaf9bbf40e
Merge: c238285 326d5fa
Author: Daniel Pfeifer
AuthorDate: Sun Oct 9 18:23:45 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 9 18:23:45 2016 -0400
Merge topic 'cmake-cleanup' into next
326d5fa7 Allow custom built libarchive to use custom built expat.
7d45db99 Don't require liblzma when using system libarchive
a28b8f95 Don't require libbz2 when using system libarchive
66c6144c CMakeCPack: remove obsolete conditions
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=326d5fa74781d807b9ecc2feed1b433657c3a92b
commit 326d5fa74781d807b9ecc2feed1b433657c3a92b
Author: Daniel Pfeifer
AuthorDate: Mon Oct 10 00:21:00 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Mon Oct 10 00:21:00 2016 +0200
Allow custom built libarchive to use custom built expat.
Expat is built anyway.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 827a19c..b8a635f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -368,6 +368,23 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(cmcompress "Utilities/3rdParty")
#-
+ # Build expat library for CMake, CTest, and libarchive.
+ if(CMAKE_USE_SYSTEM_EXPAT)
+find_package(EXPAT)
+if(NOT EXPAT_FOUND)
+ message(FATAL_ERROR
+"CMAKE_USE_SYSTEM_EXPAT is ON but a expat is not found!")
+endif()
+set(CMAKE_EXPAT_INCLUDES ${EXPAT_INCLUDE_DIRS})
+set(CMAKE_EXPAT_LIBRARIES ${EXPAT_LIBRARIES})
+ else()
+set(CMAKE_EXPAT_INCLUDES)
+set(CMAKE_EXPAT_LIBRARIES cmexpat)
+add_subdirectory(Utilities/cmexpat)
+CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
+ endif()
+
+ #-
# Build or use system libbz2 for libarchive.
if(NOT CMAKE_USE_SYSTEM_LIBARCHIVE)
if(CMAKE_USE_SYSTEM_BZIP2)
@@ -410,6 +427,8 @@ macro (CMAKE_BUILD_UTILITIES)
set(CMAKE_TAR_INCLUDES ${LibArchive_INCLUDE_DIRS})
set(CMAKE_TAR_LIBRARIES ${LibArchive_LIBRARIES})
else()
+set(EXPAT_INCLUDE_DIR ${CMAKE_EXPAT_INCLUDES})
+set(EXPAT_LIBRARY ${CMAKE_EXPAT_LIBRARIES})
set(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES})
set(ZLIB_LIBRARY ${CMAKE_ZLIB_LIBRARIES})
add_definitions(-DLIBARCHIVE_STATIC)
@@ -419,7 +438,7 @@ macro (CMAKE_BUILD_UTILITIES)
set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB
library if found")
set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found
BZip2 library if found")
set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found
libxml2 library if found")
-set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found
EXPAT library if found")
+set(ENABLE_EXPAT ON CACHE INTERNAL "Enable the use of the system found
EXPAT library if found")
set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system
found PCREPOSIX library if found")
set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found
LibGCC library if found")
set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
@@ -432,23 +451,6 @@ macro (CMAKE_BUILD_UTILITIES)
endif()
#-
- # Build expat library for CMake and CTest.
- if(CMAKE_USE_SYSTEM_EXPAT)
-find_package(EXPAT)
-if(NOT EXPAT_FOUND)
- message(FATAL_ERROR
-"CMAKE_USE_SYSTEM_EXPAT is ON but a expat is not found!")
-endif()
-set(CMAKE_EXPAT_INCLUDES ${EXPAT_INCLUDE_DIRS})
-set(CMAKE_EXPAT_LIBRARIES ${EXPAT_LIBRARIES})
- else()
-set(CMAKE_EXPAT_INCLUDES)
-set(CMAKE_EXPAT_LIBRARIES cmexpat)
-add_subdirectory(Utilities/cmexpat)
-CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
- endif()
-
- #-
# Build jsoncpp library.
if(CMAKE_USE_SYSTEM_JSONCPP)
if(NOT CMAKE_VERSION VERSION_LESS 3.0)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d45
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-304-gc238285
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 c2382855e6a9706c9f71beb1f57bfafc75587f65 (commit)
via 7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9 (commit)
from 6b05e33c95b2bb392f6c6602da4677747613e35d (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2382855e6a9706c9f71beb1f57bfafc75587f65
commit c2382855e6a9706c9f71beb1f57bfafc75587f65
Merge: 6b05e33 7f13f7a
Author: Stephen Kelly
AuthorDate: Sun Oct 9 07:14:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 9 07:14:44 2016 -0400
Merge topic 'minor-cleanups' into next
7f13f7a9 fixup! cmLocalGenerator: Extract definition retrieval out of loop
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9
commit 7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9
Author: Stephen Kelly
AuthorDate: Sun Oct 9 13:14:25 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 9 13:14:25 2016 +0200
fixup! cmLocalGenerator: Extract definition retrieval out of loop
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0a99e87..025b82a 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1176,7 +1176,8 @@ void cmLocalGenerator::GetTargetFlags(
!(this->Makefile->IsOn("CYGWIN") || this->Makefile->IsOn("MINGW"))) {
std::vector sources;
target->GetSourceFiles(sources, buildType);
-std::string defFlag =
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
+std::string defFlag =
+ this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
for (std::vector::const_iterator i = sources.begin();
i != sources.end(); ++i) {
cmSourceFile* sf = *i;
---
Summary of changes:
Source/cmLocalGenerator.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.7.0-rc1-302-g6b05e33
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 6b05e33c95b2bb392f6c6602da4677747613e35d (commit)
via 5de760147f83b507f5b5dda7051eb1f6386e052b (commit)
via 95ac050958f063223a4a3f660aa5d8521b089c3f (commit)
via 6e3b88962c6762ab384ef73c9a77444ace4b0738 (commit)
via 2a49d86d5dec66f7696bd7063459f504cc336a5e (commit)
via b0301db23b12351720993a351fedf081ca0fa444 (commit)
via 267e02097e90d05a16ffd1aa53fb7910b79aa0ec (commit)
via 009019f2596de08c488588fd2c67a423f9fe92bf (commit)
via 378849f41e574e72c577b549dfc2d5333ca8f9b5 (commit)
via 4a3c49b4698f0e8c20c345770f551142088a3037 (commit)
from 2f5c30a55bdabcf606b26abb89395608170f9ae2 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b05e33c95b2bb392f6c6602da4677747613e35d
commit 6b05e33c95b2bb392f6c6602da4677747613e35d
Merge: 2f5c30a 5de7601
Author: Stephen Kelly
AuthorDate: Sun Oct 9 04:49:00 2016 -0400
Commit: CMake Topic Stage
CommitDate: Sun Oct 9 04:49:00 2016 -0400
Merge topic 'minor-cleanups' into next
5de76014 cmMakefile: Return a string from GetDefineFlags
95ac0509 Test: Remove condition for CMake version no longer supported
6e3b8896 cmLocalGenerator: Extract definition retrieval out of loop
2a49d86d Makefiles: Inline only use of method
b0301db2 Makefiles: Make helper class independent of cmLocalGenerator
267e0209 cmMakefile: Remove pointless condition
009019f2 Makefiles: Extract identical code from condition
378849f4 Makefiles: Replace array access with local variable
4a3c49b4 Makefiles: Separate two coupled calls
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de760147f83b507f5b5dda7051eb1f6386e052b
commit 5de760147f83b507f5b5dda7051eb1f6386e052b
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:47:45 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 9 10:47:45 2016 +0200
cmMakefile: Return a string from GetDefineFlags
Flip condition in GHS for readability.
diff --git a/Source/cmGhsMultiTargetGenerator.cxx
b/Source/cmGhsMultiTargetGenerator.cxx
index 959dfdb..fac68f5 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -244,7 +244,7 @@ void
cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const& config,
flags, this->GeneratorTarget, lang);
// Append old-style preprocessor definition flags.
-if (std::string(" ") != std::string(this->Makefile->GetDefineFlags())) {
+if (this->Makefile->GetDefineFlags() != " ") {
this->LocalGenerator->AppendFlags(flags,
this->Makefile->GetDefineFlags());
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 40344ce..de7bead 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -447,7 +447,7 @@ public:
/**
* Get a list of preprocessor define flags.
*/
- const char* GetDefineFlags() const { return this->DefineFlags.c_str(); }
+ std::string GetDefineFlags() const { return this->DefineFlags; }
/**
* Make sure CMake can write this file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95ac050958f063223a4a3f660aa5d8521b089c3f
commit 95ac050958f063223a4a3f660aa5d8521b089c3f
Author: Stephen Kelly
AuthorDate: Sun Oct 9 10:47:44 2016 +0200
Commit: Stephen Kelly
CommitDate: Sun Oct 9 10:47:44 2016 +0200
Test: Remove condition for CMake version no longer supported
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 56fcc5d..23832da 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -20,16 +20,9 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake
@ONLY)
# now set up the test:
-if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
- file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
-CONTENT "CMAKE = \"$\"\n"
- )
-else()
- get_target_property(cmakeLocation cmake LOCATION)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
-"CMAKE = \"${cmakeLocation}\"\n"
- )
-endif()
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
+ CONTENT "CMAKE = \"$\"\n"
+)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in
${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
${CMAKE_CURRENT_BINARY_DIR}/main.cpp COPYONLY)
https
