[Cmake-commits] CMake branch, master, updated. v3.6.2-1157-g08147a7
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 08147a7feabba4113c29f8e898ebe3047180e4bf (commit) from 6757e6608992354300d635a96fed29800a4856c3 (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=08147a7feabba4113c29f8e898ebe3047180e4bf commit 08147a7feabba4113c29f8e898ebe3047180e4bf Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Sat Sep 24 00:01:04 2016 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Sat Sep 24 00:01:04 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 27ca0ca..8049153 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 6) -set(CMake_VERSION_PATCH 20160923) +set(CMake_VERSION_PATCH 20160924) #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.6.2-2442-g9041fb2
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 9041fb2470a9df8ce922bb0c8e591e99b98fd5fd (commit) via 92207752dfaeeffe674946a7139475777ad90eac (commit) from ffa78c37c8efccc0d73ceae0fd0c31eabca1633d (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=9041fb2470a9df8ce922bb0c8e591e99b98fd5fd commit 9041fb2470a9df8ce922bb0c8e591e99b98fd5fd Merge: ffa78c3 9220775 Author: Daniel PfeiferAuthorDate: Fri Sep 23 16:44:08 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 16:44:08 2016 -0400 Merge topic 'tidy-server' into next 92207752 cmServer: add braces around conditional statements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92207752dfaeeffe674946a7139475777ad90eac commit 92207752dfaeeffe674946a7139475777ad90eac Author: Daniel Pfeifer AuthorDate: Fri Sep 23 22:43:36 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 23 22:43:36 2016 +0200 cmServer: add braces around conditional statements diff --git a/Source/cmServer.cxx b/Source/cmServer.cxx index d5dac4e..46c1946 100644 --- a/Source/cmServer.cxx +++ b/Source/cmServer.cxx @@ -123,8 +123,9 @@ void cmServer::RegisterProtocol(cmServerProtocol* protocol) [version](cmServerProtocol* p) { return p->ProtocolVersion() == version; }); - if (it == this->SupportedProtocols.end()) + if (it == this->SupportedProtocols.end()) { this->SupportedProtocols.push_back(protocol); + } } void cmServer::PrintHello() const @@ -181,37 +182,44 @@ void cmServer::reportMessage(const char* msg, const char* title, cmServerResponse cmServer::SetProtocolVersion(const cmServerRequest& request) { - if (request.Type != kHANDSHAKE_TYPE) + if (request.Type != kHANDSHAKE_TYPE) { return request.ReportError("Waiting for type \"" + kHANDSHAKE_TYPE + "\"."); + } Json::Value requestedProtocolVersion = request.Data[kPROTOCOL_VERSION_KEY]; - if (requestedProtocolVersion.isNull()) + if (requestedProtocolVersion.isNull()) { return request.ReportError("\"" + kPROTOCOL_VERSION_KEY + "\" is required for \"" + kHANDSHAKE_TYPE + "\"."); + } - if (!requestedProtocolVersion.isObject()) + if (!requestedProtocolVersion.isObject()) { return request.ReportError("\"" + kPROTOCOL_VERSION_KEY + "\" must be a JSON object."); + } Json::Value majorValue = requestedProtocolVersion[kMAJOR_KEY]; - if (!majorValue.isInt()) + if (!majorValue.isInt()) { return request.ReportError("\"" + kMAJOR_KEY + "\" must be set and an integer."); + } Json::Value minorValue = requestedProtocolVersion[kMINOR_KEY]; - if (!minorValue.isNull() && !minorValue.isInt()) + if (!minorValue.isNull() && !minorValue.isInt()) { return request.ReportError("\"" + kMINOR_KEY + "\" must be unset or an integer."); + } const int major = majorValue.asInt(); const int minor = minorValue.isNull() ? -1 : minorValue.asInt(); - if (major < 0) + if (major < 0) { return request.ReportError("\"" + kMAJOR_KEY + "\" must be >= 0."); - if (!minorValue.isNull() && minor < 0) + } + if (!minorValue.isNull() && minor < 0) { return request.ReportError("\"" + kMINOR_KEY + "\" must be >= 0 when set."); + } this->Protocol = this->FindMatchingProtocol(this->SupportedProtocols, major, minor); @@ -284,12 +292,15 @@ cmServerProtocol* cmServer::FindMatchingProtocol( cmServerProtocol* bestMatch = nullptr; for (auto protocol : protocols) { auto version = protocol->ProtocolVersion(); -if (major != version.first) +if (major != version.first) { continue; -if (minor == version.second) +} +if (minor == version.second) { return protocol; -if (!bestMatch || bestMatch->ProtocolVersion().second < version.second) +} +if (!bestMatch || bestMatch->ProtocolVersion().second < version.second) { bestMatch = protocol; +} } return minor < 0 ? bestMatch : nullptr; } @@ -317,8 +328,9 @@ void cmServer::WriteMessage(const cmServerRequest& request, const std::string& message, const std::string& title) const { - if (message.empty()) + if (message.empty()) { return; + } Json::Value obj =
[Cmake-commits] CMake branch, next, updated. v3.6.2-2440-gffa78c3
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 ffa78c37c8efccc0d73ceae0fd0c31eabca1633d (commit) via b941f3bfe7ba3bffd535372c2a4d9d668bc83356 (commit) via a5a7771a428a1d4a9bb671e56ea6d497361bc753 (commit) via 6ed564577dd0fffdd7dabfaa0ba14e2518c26048 (commit) from 3c6d4f69016e6ce48430b3d49c63857aaeb14b76 (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=ffa78c37c8efccc0d73ceae0fd0c31eabca1633d commit ffa78c37c8efccc0d73ceae0fd0c31eabca1633d Merge: 3c6d4f6 b941f3b Author: Daniel PfeiferAuthorDate: Fri Sep 23 16:07:41 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 16:07:41 2016 -0400 Merge topic 'ctest-no-manual-delete' into next b941f3bf CTest::CompressString: Avoid manual delete a5a7771a CTest::CompressString: Reorder code to avoid unnecessary allocation 6ed56457 CTest::Base64EncodeFile: Avoid manual delete https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b941f3bfe7ba3bffd535372c2a4d9d668bc83356 commit b941f3bfe7ba3bffd535372c2a4d9d668bc83356 Author: Daniel Pfeifer AuthorDate: Fri Sep 23 22:06:17 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 23 22:06:17 2016 +0200 CTest::CompressString: Avoid manual delete diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 0624b52..9b5248e 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2803,34 +2803,29 @@ bool cmCTest::CompressString(std::string& str) // zlib makes the guarantee that this is the maximum output size int outSize = static_cast(static_cast(str.size()) * 1.001 + 13.0); - unsigned char* out = new unsigned char[outSize]; + std::vector out(outSize); strm.avail_in = static_cast(str.size()); strm.next_in = in; strm.avail_out = outSize; - strm.next_out = out; + strm.next_out = [0]; ret = deflate(, Z_FINISH); if (ret == Z_STREAM_ERROR || ret != Z_STREAM_END) { cmCTestLog(this, ERROR_MESSAGE, "Error during gzip compression." << std::endl); -delete[] out; return false; } (void)deflateEnd(); // Now base64 encode the resulting binary string - unsigned char* base64EncodedBuffer = new unsigned char[(outSize * 3) / 2]; + std::vector base64EncodedBuffer((outSize * 3) / 2); size_t rlen = -cmsysBase64_Encode(out, strm.total_out, base64EncodedBuffer, 1); +cmsysBase64_Encode([0], strm.total_out, [0], 1); - str = ""; - str.append(reinterpret_cast (base64EncodedBuffer), rlen); - - delete[] base64EncodedBuffer; - delete[] out; + str.assign(reinterpret_cast ([0]), rlen); return true; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5a7771a428a1d4a9bb671e56ea6d497361bc753 commit a5a7771a428a1d4a9bb671e56ea6d497361bc753 Author: Daniel Pfeifer AuthorDate: Fri Sep 23 22:04:47 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 23 22:04:47 2016 +0200 CTest::CompressString: Reorder code to avoid unnecessary allocation diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index d058ca7..0624b52 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2790,22 +2790,21 @@ bool cmCTest::CompressString(std::string& str) int ret; z_stream strm; - unsigned char* in = -reinterpret_cast(const_cast (str.c_str())); - // zlib makes the guarantee that this is the maximum output size - int outSize = -static_cast(static_cast(str.size()) * 1.001 + 13.0); - unsigned char* out = new unsigned char[outSize]; - strm.zalloc = Z_NULL; strm.zfree = Z_NULL; strm.opaque = Z_NULL; ret = deflateInit(, -1); // default compression level if (ret != Z_OK) { -delete[] out; return false; } + unsigned char* in = +reinterpret_cast(const_cast (str.c_str())); + // zlib makes the guarantee that this is the maximum output size + int outSize = +static_cast(static_cast(str.size()) * 1.001 + 13.0); + unsigned char* out = new unsigned char[outSize]; + strm.avail_in = static_cast(str.size()); strm.next_in = in; strm.avail_out = outSize; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ed564577dd0fffdd7dabfaa0ba14e2518c26048 commit 6ed564577dd0fffdd7dabfaa0ba14e2518c26048 Author: Daniel Pfeifer AuthorDate: Fri Sep 23 22:03:49 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 23 22:03:49 2016 +0200 CTest::Base64EncodeFile: Avoid manual delete diff --git a/Source/cmCTest.cxx
[Cmake-commits] CMake branch, next, updated. v3.6.2-2436-g3c6d4f6
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 3c6d4f69016e6ce48430b3d49c63857aaeb14b76 (commit) via 061e0e1b30ad8db23e9c416c983627c618cb2737 (commit) via a2bf3ec9f86a3395ba79764167bd44690a379766 (commit) from b09e96ba1960ce16f09b73767b9d3a2a171b (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=3c6d4f69016e6ce48430b3d49c63857aaeb14b76 commit 3c6d4f69016e6ce48430b3d49c63857aaeb14b76 Merge: b09e900 061e0e1 Author: Daniel PfeiferAuthorDate: Fri Sep 23 15:57:08 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 15:57:08 2016 -0400 Merge topic 'auto-ptr' into next 061e0e1b Use std::auto_ptr on compilers that do not warn about it a2bf3ec9 Add a feature check to test availability of auto_ptr https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=061e0e1b30ad8db23e9c416c983627c618cb2737 commit 061e0e1b30ad8db23e9c416c983627c618cb2737 Author: Daniel Pfeifer AuthorDate: Fri Sep 23 21:56:34 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 23 21:56:34 2016 +0200 Use std::auto_ptr on compilers that do not warn about it diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx index f6c4362..f38eda5 100644 --- a/Source/cm_auto_ptr.hxx +++ b/Source/cm_auto_ptr.hxx @@ -14,7 +14,13 @@ #include -// FIXME: Use std::auto_ptr on compilers that do not warn about it. +#ifdef CMake_HAVE_CXX_AUTO_PTR + +#include +#define CM_AUTO_PTR std::auto_ptr + +#else + #define CM_AUTO_PTR cm::auto_ptr // The HP compiler cannot handle the conversions necessary to use @@ -219,3 +225,5 @@ public: #endif #endif + +#endif https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2bf3ec9f86a3395ba79764167bd44690a379766 commit a2bf3ec9f86a3395ba79764167bd44690a379766 Author: Daniel Pfeifer AuthorDate: Fri Sep 23 21:49:12 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 23 21:49:12 2016 +0200 Add a feature check to test availability of auto_ptr diff --git a/Source/Checks/cm_cxx_auto_ptr.cxx b/Source/Checks/cm_cxx_auto_ptr.cxx new file mode 100644 index 000..fc49346 --- /dev/null +++ b/Source/Checks/cm_cxx_auto_ptr.cxx @@ -0,0 +1,16 @@ +#include + +std::auto_ptr get_auto_ptr() +{ + return std::auto_ptr(new int(0)); +} + +int use_auto_ptr(std::auto_ptr ptr) +{ + return *ptr; +} + +int main() +{ + return use_auto_ptr(get_auto_ptr()); +} diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index c6a532f..83bcff5 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -36,6 +36,7 @@ if(CMAKE_CXX_STANDARD) if(CMake_HAVE_CXX_MAKE_UNIQUE) set(CMake_HAVE_CXX_UNIQUE_PTR 1) endif() + cm_check_cxx_feature(auto_ptr) cm_check_cxx_feature(nullptr) cm_check_cxx_feature(override) cm_check_cxx_feature(unique_ptr) diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 8365367..8a1e81f 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -30,6 +30,7 @@ #cmakedefine CMAKE_USE_MACH_PARSER #cmakedefine CMAKE_USE_LIBUV #cmakedefine CMAKE_ENCODING_UTF8 +#cmakedefine CMake_HAVE_CXX_AUTO_PTR #cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE #cmakedefine CMake_HAVE_CXX_NULLPTR #cmakedefine CMake_HAVE_CXX_OVERRIDE --- Summary of changes: Source/Checks/cm_cxx_auto_ptr.cxx | 16 Source/Checks/cm_cxx_features.cmake |1 + Source/cmConfigure.cmake.h.in |1 + Source/cm_auto_ptr.hxx | 10 +- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Source/Checks/cm_cxx_auto_ptr.cxx 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.6.2-2433-gb09e900
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 b09e96ba1960ce16f09b73767b9d3a2a171b (commit) via 0c95231744091d1bcd430cd263374ca90db9efe8 (commit) via 49d50ad40719722236c7867bd69e7ab414224c49 (commit) from 9c066f0082a2b4cb35e668cd7262cba6d65d21fc (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=b09e96ba1960ce16f09b73767b9d3a2a171b commit b09e96ba1960ce16f09b73767b9d3a2a171b Merge: 9c066f0 0c95231 Author: Brad KingAuthorDate: Fri Sep 23 13:34:21 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 13:34:21 2016 -0400 Merge topic 'xcode-swift-version' into next 0c952317 Xcode: Add option to set Swift language version 49d50ad4 Xcode: Port rudimentary Swift support to Xcode 8 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c95231744091d1bcd430cd263374ca90db9efe8 commit 0c95231744091d1bcd430cd263374ca90db9efe8 Author: Brad King AuthorDate: Fri Sep 23 13:25:35 2016 -0400 Commit: Brad King CommitDate: Fri Sep 23 13:33:36 2016 -0400 Xcode: Add option to set Swift language version Create a new CMAKE_Swift_LANGUAGE_VERSION variable to specify the SWIFT_VERSION attribute in a generated Xcode project. Ideally this would be a `_STANDARD` property but since Swift support is very minimal we should reserve that property for more complete treatment later. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 9e0efe9..d9da3d6 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -396,6 +396,7 @@ Variables for Languages /variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS /variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES /variable/CMAKE_LANG_STANDARD_LIBRARIES + /variable/CMAKE_Swift_LANGUAGE_VERSION /variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG Variables for CTest diff --git a/Help/release/dev/xcode-swift-version.rst b/Help/release/dev/xcode-swift-version.rst new file mode 100644 index 000..5dff23c --- /dev/null +++ b/Help/release/dev/xcode-swift-version.rst @@ -0,0 +1,6 @@ +xcode-swift-version +--- + +* The :generator:`Xcode` generator's rudimentary Swift language support + learned to honor a new :variable:`CMAKE_Swift_LANGUAGE_VERSION` variable + to tell Xcode what version of Swift is used by the source. diff --git a/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst b/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst new file mode 100644 index 000..50121e2 --- /dev/null +++ b/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst @@ -0,0 +1,5 @@ +CMAKE_Swift_LANGUAGE_VERSION + + +Set to the Swift language version number. If not set, the legacy "2.3" +version is assumed. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 42d97db..0d5de06 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2997,7 +2997,13 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( this->CreateString(this->GeneratorToolset)); } if (this->GetLanguageEnabled("Swift")) { -buildSettings->AddAttribute("SWIFT_VERSION", this->CreateString("2.3")); +std::string swiftVersion = "2.3"; +if (const char* vers = this->CurrentMakefile->GetDefinition( + "CMAKE_Swift_LANGUAGE_VERSION")) { + swiftVersion = vers; +} +buildSettings->AddAttribute("SWIFT_VERSION", +this->CreateString(swiftVersion)); } std::string symroot = root->GetCurrentBinaryDirectory(); diff --git a/Tests/SwiftOnly/CMakeLists.txt b/Tests/SwiftOnly/CMakeLists.txt index 5cb9739..cf4463c 100644 --- a/Tests/SwiftOnly/CMakeLists.txt +++ b/Tests/SwiftOnly/CMakeLists.txt @@ -1,4 +1,8 @@ cmake_minimum_required(VERSION 3.3) project(SwiftOnly Swift) +if(NOT XCODE_VERSION VERSION_LESS 8.0) + set(CMAKE_Swift_LANGUAGE_VERSION 3.0) +endif() + add_executable(SwiftOnly main.swift) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49d50ad40719722236c7867bd69e7ab414224c49 commit 49d50ad40719722236c7867bd69e7ab414224c49 Author: Brad King AuthorDate: Fri Sep 23 11:43:08 2016 -0400 Commit: Brad King CommitDate: Fri Sep 23 11:47:06 2016 -0400 Xcode: Port rudimentary Swift support to Xcode 8 The `.pbxproj` file must now specify a `SWIFT_VERSION` value. Set it to the legacy value of "2.3" for now. Later this can be made
[Cmake-commits] CMake branch, next, updated. v3.6.2-2428-g18f452c
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 18f452c66038a971713e369d6dbc582fef077f1c (commit) via 11f0a95ba2158377a11836bef561517d9781d898 (commit) from 4d7b5dceb90d80e650ed64af491d8a1765d1c60d (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=18f452c66038a971713e369d6dbc582fef077f1c commit 18f452c66038a971713e369d6dbc582fef077f1c Merge: 4d7b5dc 11f0a95 Author: Brad KingAuthorDate: Fri Sep 23 10:09:50 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 10:09:50 2016 -0400 Merge topic 'CPackNSIS-per-component-install' into next 11f0a95b CPack/NSIS custom component install directory https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11f0a95ba2158377a11836bef561517d9781d898 commit 11f0a95ba2158377a11836bef561517d9781d898 Author: Roman Wüger AuthorDate: Fri Sep 23 09:28:35 2016 +0200 Commit: Roman Wüger CommitDate: Fri Sep 23 09:28:35 2016 +0200 CPack/NSIS custom component install directory diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake index db5984a..4693ce5 100644 --- a/Modules/CPackNSIS.cmake +++ b/Modules/CPackNSIS.cmake @@ -96,6 +96,11 @@ # Contact information for questions and comments about the installation # process. # +# .. variable:: CPACK_NSIS__INSTALL_DIRECTORY +# +# Custom install directory for the specified component instead +# of $INSTDIR. +# # .. variable:: CPACK_NSIS_CREATE_ICONS_EXTRA # # Additional NSIS commands for creating start menu shortcuts. diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 2db94f1..168a437 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -71,14 +71,26 @@ int cmCPackNSISGenerator::PackageFiles() std::ostringstream str; std::vector::const_iterator it; for (it = files.begin(); it != files.end(); ++it) { +std::string outputDir = "$INSTDIR"; std::string fileN = cmSystemTools::RelativePath(toplevel.c_str(), it->c_str()); if (!this->Components.empty()) { + const size_t pos = fileN.find('/'); + // Strip off the component part of the path. - fileN = fileN.substr(fileN.find('/') + 1, std::string::npos); + fileN = fileN.substr(pos + 1, std::string::npos); + + // Use the custom component install directory if we have one + if (pos != std::string::npos) { +const std::string componentName = fileN.substr(0, pos); +outputDir = CustomComponentInstallDirectory(componentName); + } else { +outputDir = CustomComponentInstallDirectory(fileN); + } } std::replace(fileN.begin(), fileN.end(), '/', '\\'); -str << " Delete \"$INSTDIR\\" << fileN << "\"" << std::endl; + +str << " Delete \"" << outputDir << "\\" << fileN << "\"" << std::endl; } cmCPackLogger(cmCPackLog::LOG_DEBUG, "Uninstall Files: " << str.str() << std::endl); @@ -108,7 +120,12 @@ int cmCPackNSISGenerator::PackageFiles() } } std::replace(fileN.begin(), fileN.end(), '/', '\\'); -dstr << " RMDir \"$INSTDIR\\" << fileN << "\"" << std::endl; + +const std::string componentOutputDir = + CustomComponentInstallDirectory(fileN); + +dstr << " RMDir \"" << componentOutputDir << "\\" << fileN << "\"" + << std::endl; if (!componentName.empty()) { this->Components[componentName].Directories.push_back(fileN); } @@ -650,7 +667,10 @@ std::string cmCPackNSISGenerator::CreateComponentDescription( } componentCode += " SectionIn" + out.str() + "\n"; } - componentCode += " SetOutPath \"$INSTDIR\"\n"; + + const std::string componentOutputDir = +CustomComponentInstallDirectory(component->Name); + componentCode += " SetOutPath \"" + componentOutputDir + "\"\n"; // Create the actual installation commands if (component->IsDownloaded) { @@ -796,13 +816,13 @@ std::string cmCPackNSISGenerator::CreateComponentDescription( ++pathIt) { path = *pathIt; std::replace(path.begin(), path.end(), '/', '\\'); -macrosOut << " Delete \"$INSTDIR\\" << path << "\"\n"; +macrosOut << " Delete \"" << componentOutputDir << "\\" << path << "\"\n"; } for (pathIt = component->Directories.begin(); pathIt != component->Directories.end(); ++pathIt) { path = *pathIt; std::replace(path.begin(), path.end(), '/', '\\'); -macrosOut << " RMDir \"$INSTDIR\\" << path << "\"\n"; +macrosOut
[Cmake-commits] CMake branch, next, updated. v3.6.2-2426-g4d7b5dc
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 4d7b5dceb90d80e650ed64af491d8a1765d1c60d (commit) via b36408a092b946568abbe935062e14aedadc161b (commit) via 7274fd9c1934d617464b752210ff16ee4f3c96fb (commit) via ccd1341ac935d6ba479f3dc27b6041bff0c1c970 (commit) via aaf4014c28d0d0bf5180dffd5c4a628406a5e7a1 (commit) from e32d2f7b343eb697ac7ddcdcff68d3dd4234d767 (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=4d7b5dceb90d80e650ed64af491d8a1765d1c60d commit 4d7b5dceb90d80e650ed64af491d8a1765d1c60d Merge: e32d2f7 b36408a Author: Brad KingAuthorDate: Fri Sep 23 09:40:07 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 09:40:07 2016 -0400 Merge topic 'FindMatlab-simulink' into next b36408a0 FindMatlab: Add notes for topic 'FindMatlab-simulink' 7274fd9c FindMatlab: Add EXECUTABLE, MODULE, and SHARED options to matlab_add_mex ccd1341a FindMatlab: Add SIMULINK component aaf4014c FindMatlab: Fix documentation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b36408a092b946568abbe935062e14aedadc161b commit b36408a092b946568abbe935062e14aedadc161b Author: Brad King AuthorDate: Fri Sep 23 09:36:05 2016 -0400 Commit: Brad King CommitDate: Fri Sep 23 09:36:05 2016 -0400 FindMatlab: Add notes for topic 'FindMatlab-simulink' diff --git a/Help/release/dev/FindMatlab-simulink.rst b/Help/release/dev/FindMatlab-simulink.rst new file mode 100644 index 000..cd25412 --- /dev/null +++ b/Help/release/dev/FindMatlab-simulink.rst @@ -0,0 +1,4 @@ +FindMatlab-simulink +--- + +* The :module:`FindMatlab` module learned to find a SIMULINK component. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7274fd9c1934d617464b752210ff16ee4f3c96fb commit 7274fd9c1934d617464b752210ff16ee4f3c96fb Author: Jamie Snape AuthorDate: Thu Sep 22 09:09:58 2016 -0400 Commit: Brad King CommitDate: Fri Sep 23 09:28:27 2016 -0400 FindMatlab: Add EXECUTABLE, MODULE, and SHARED options to matlab_add_mex diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 548d298..8b41bb9 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -821,12 +821,13 @@ endfunction() # order to produce a MEX file. The final name of the produced output may be # specified, as well as additional link libraries, and a documentation entry # for the MEX file. Remaining arguments of the call are passed to the -# :command:`add_library` command. +# :command:`add_library` or :command:`add_executable` command. # # :: # # matlab_add_mex( # NAME +# [EXECUTABLE | MODULE | SHARED] # SRC src1 [src2 ...] # [OUTPUT_NAME output_name] # [DOCUMENTATION file.txt] @@ -853,6 +854,10 @@ endfunction() # mex file, and with extension `.m`. In that case, typing ``help `` # in Matlab prints the documentation contained in this file. # +# ``MODULE`` or ``SHARED`` may be given to specify the type of library to be +# created. ``EXECUTABLE`` may be given to create an executable instead of +# a library. If no type is given explicitly, the type is ``SHARED``. +# # The documentation file is not processed and should be in the following # format: # @@ -861,7 +866,7 @@ endfunction() # % This is the documentation # function ret = mex_target_output_name(input1) # -function(matlab_add_mex ) +function(matlab_add_mex) if(NOT WIN32) # we do not need all this on Windows @@ -873,6 +878,7 @@ function(matlab_add_mex ) endif() + set(options EXECUTABLE MODULE SHARED) set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME) set(multiValueArgs LINK_TO SRC) @@ -887,11 +893,25 @@ function(matlab_add_mex ) set(${prefix}_OUTPUT_NAME ${${prefix}_NAME}) endif() - add_library(${${prefix}_NAME} -SHARED + if(${prefix}_EXECUTABLE) +add_executable(${${prefix}_NAME} + ${${prefix}_SRC} + ${${prefix}_DOCUMENTATION} + ${${prefix}_UNPARSED_ARGUMENTS}) + else() +if(${prefix}_MODULE) + set(type MODULE) +else() + set(type SHARED) +endif() + +add_library(${${prefix}_NAME} + ${type} ${${prefix}_SRC} ${${prefix}_DOCUMENTATION} ${${prefix}_UNPARSED_ARGUMENTS}) + endif() + target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS}) if(DEFINED Matlab_MX_LIBRARY)
[Cmake-commits] CMake branch, master, updated. v3.6.2-1156-g6757e66
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 6757e6608992354300d635a96fed29800a4856c3 (commit) via eb1524869cba77e008b4d569dbc1b487f93e04e0 (commit) from 3a883a9f7dd8c9f5e67475fcdce25ebd066636db (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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.6.2-2-geb15248
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 eb1524869cba77e008b4d569dbc1b487f93e04e0 (commit) via 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 (commit) from c5dcd31e92c0a09009a340e3fe23ced4f6190b64 (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: Source/QtDialog/CMakeSetup.cxx |2 ++ 1 file changed, 2 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.6.2-2421-ge32d2f7
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 e32d2f7b343eb697ac7ddcdcff68d3dd4234d767 (commit) via 6757e6608992354300d635a96fed29800a4856c3 (commit) via eb1524869cba77e008b4d569dbc1b487f93e04e0 (commit) from 7c1646a208a13e5d187543c9ab5fef75aa218780 (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=e32d2f7b343eb697ac7ddcdcff68d3dd4234d767 commit e32d2f7b343eb697ac7ddcdcff68d3dd4234d767 Merge: 7c1646a 6757e66 Author: Brad KingAuthorDate: Fri Sep 23 08:43:45 2016 -0400 Commit: Brad King CommitDate: Fri Sep 23 08:43:45 2016 -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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.2-2418-g7c1646a
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 7c1646a208a13e5d187543c9ab5fef75aa218780 (commit) via 3a883a9f7dd8c9f5e67475fcdce25ebd066636db (commit) via 961536dc85b41f77db3d2d220cbf720d0056369a (commit) via c60fe3307591a76d498b4eae7ab8d801c65a709d (commit) via e9cae187c38ffef4da0b486980491d87e1d91507 (commit) via aec5bf8edb1b4fb4a13689992abfd9cba54046e8 (commit) via 0314f26412d3944f7ead47656e9347440141e815 (commit) via 785f875426ec7aebb6583419515bf4e4c3975464 (commit) via d0a27ae998e5ff313937f346b53d672c6353bd74 (commit) from 3bb5115ac5b7a0b2179ef0d890783b67f285d312 (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=7c1646a208a13e5d187543c9ab5fef75aa218780 commit 7c1646a208a13e5d187543c9ab5fef75aa218780 Merge: 3bb5115 3a883a9 Author: Brad KingAuthorDate: Fri Sep 23 08:40:49 2016 -0400 Commit: Brad King CommitDate: Fri Sep 23 08:40:49 2016 -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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.2-1140-gc60fe33
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 c60fe3307591a76d498b4eae7ab8d801c65a709d (commit) via eb8cd35684f2dc2f53d205d7738e1c01a12a493f (commit) via a41c8724d155f1cd74ce36cdfbd10da0eac5b389 (commit) via 1ec5097d4d15cfb2d24a8f23cb6accf38f870981 (commit) via d7bd2efbc4ffeb56cc1f9ddafffc49a8e42d09c2 (commit) from e9cae187c38ffef4da0b486980491d87e1d91507 (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=c60fe3307591a76d498b4eae7ab8d801c65a709d commit c60fe3307591a76d498b4eae7ab8d801c65a709d Merge: e9cae18 eb8cd35 Author: Brad KingAuthorDate: Fri Sep 23 08:40:10 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 08:40:10 2016 -0400 Merge topic 'test-Fortran-split' eb8cd356 Tests: Split Fortran module testing into separate FortranModules test a41c8724 Tests: Check if Fortran compiler supports F90 1ec5097d Tests: Use more generic variables in Fortran test d7bd2efb Tests: Remove trailing line from Fortran/External --- Summary of changes: Tests/CMakeLists.txt | 14 ++- Tests/CheckFortran.cmake |3 + Tests/Fortran/CMakeLists.txt | 89 +--- Tests/FortranModules/CMakeLists.txt| 78 + .../Executable/CMakeLists.txt |0 .../Executable/main.f90|0 .../External/CMakeLists.txt|1 - Tests/{Fortran => FortranModules}/External/a.f90 |0 .../Library/CMakeLists.txt |0 Tests/{Fortran => FortranModules}/Library/a.f90|0 Tests/{Fortran => FortranModules}/Library/b.f90|0 Tests/{Fortran => FortranModules}/Library/main.f90 |0 .../Subdir/CMakeLists.txt |0 .../{Fortran => FortranModules}/Subdir/subdir.f90 |0 .../in_interface/main.f90 |0 .../in_interface/module.f90|0 .../include/test_preprocess.h |0 .../test_module_implementation.f90 |0 .../test_module_interface.f90 |0 .../test_module_main.f90 |0 .../test_preprocess.F90|0 .../test_preprocess_module.F90 |0 .../test_use_in_comment_fixedform.f|0 .../test_use_in_comment_freeform.f90 |0 24 files changed, 96 insertions(+), 89 deletions(-) create mode 100644 Tests/FortranModules/CMakeLists.txt rename Tests/{Fortran => FortranModules}/Executable/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/Executable/main.f90 (100%) rename Tests/{Fortran => FortranModules}/External/CMakeLists.txt (98%) rename Tests/{Fortran => FortranModules}/External/a.f90 (100%) rename Tests/{Fortran => FortranModules}/Library/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/Library/a.f90 (100%) rename Tests/{Fortran => FortranModules}/Library/b.f90 (100%) rename Tests/{Fortran => FortranModules}/Library/main.f90 (100%) rename Tests/{Fortran => FortranModules}/Subdir/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/Subdir/subdir.f90 (100%) rename Tests/{Fortran => FortranModules}/in_interface/main.f90 (100%) rename Tests/{Fortran => FortranModules}/in_interface/module.f90 (100%) rename Tests/{Fortran => FortranModules}/include/test_preprocess.h (100%) rename Tests/{Fortran => FortranModules}/test_module_implementation.f90 (100%) rename Tests/{Fortran => FortranModules}/test_module_interface.f90 (100%) rename Tests/{Fortran => FortranModules}/test_module_main.f90 (100%) rename Tests/{Fortran => FortranModules}/test_preprocess.F90 (100%) rename Tests/{Fortran => FortranModules}/test_preprocess_module.F90 (100%) rename Tests/{Fortran => FortranModules}/test_use_in_comment_fixedform.f (100%) rename Tests/{Fortran => FortranModules}/test_use_in_comment_freeform.f90 (100%) 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.6.2-1135-ge9cae18
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 e9cae187c38ffef4da0b486980491d87e1d91507 (commit) via 764775c4dd7b97e753d566d363c7ce9968343b5b (commit) from aec5bf8edb1b4fb4a13689992abfd9cba54046e8 (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=e9cae187c38ffef4da0b486980491d87e1d91507 commit e9cae187c38ffef4da0b486980491d87e1d91507 Merge: aec5bf8 764775c Author: Brad KingAuthorDate: Fri Sep 23 08:40:07 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 08:40:07 2016 -0400 Merge topic 'fix-xcode-attribute-LOCATIONs' 764775c4 Fix XCODE_ATTRIBUTE_..._LOCATION target property lookup --- Summary of changes: Source/cmTarget.cxx |3 ++- Tests/RunCMake/XcodeProject/RunCMakeTest.cmake |1 + ...eedsEscape-check.cmake => XcodeAttributeLocation-check.cmake} |6 +++--- Tests/RunCMake/XcodeProject/XcodeAttributeLocation.cmake |3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) copy Tests/RunCMake/XcodeProject/{XcodeObjectNeedsEscape-check.cmake => XcodeAttributeLocation-check.cmake} (54%) create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeLocation.cmake 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.6.2-1154-g3a883a9
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 3a883a9f7dd8c9f5e67475fcdce25ebd066636db (commit) via 330581502a7c7332a8f3ec15d57e1c21f7ff1ca8 (commit) via 59aae29214b727944978b8e545a552f96c88b883 (commit) via 39ebfc79e614dc395d5ace2ad5818b3ba75ca478 (commit) via 9a77680eed49939f8ba418af96eefd42ecea0ae1 (commit) via 0f331d7893bee523e61109661d4e51566f41c350 (commit) via d3e0b64b1432700a71a10ddf06084f7bb8500694 (commit) via 8eca59a175b551c2d4c98fd9523e6aca6c51a82b (commit) via a57d1bb7122be79101cc17a4b8a04bd0ac5a041e (commit) via 0488ae63ea8dfa8ac455e36b7cc41e81620a080f (commit) via f0a23aa3dbbe2751bbb4969e1371380561b566ee (commit) from 961536dc85b41f77db3d2d220cbf720d0056369a (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=3a883a9f7dd8c9f5e67475fcdce25ebd066636db commit 3a883a9f7dd8c9f5e67475fcdce25ebd066636db Merge: 961536d 3305815 Author: Brad KingAuthorDate: Fri Sep 23 08:40:16 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 08:40:16 2016 -0400 Merge topic 'ninja-fortran' 33058150 Help: Document Ninja generator conditional Fortran support 59aae292 Ninja: Add dyndep rules for Fortran module dependencies 39ebfc79 Ninja: Add explicit preprocessing step for Fortran 9a77680e Ninja: Conditionally allow Fortran based on ninja 'dyndep' support 0f331d78 Ninja: Add internal tool to produce a ninja dyndep file for Fortran d3e0b64b Ninja: Add internal tool to scan Fortran code for module dependencies 8eca59a1 Ninja: Add comment with Fortran dependency design documentation a57d1bb7 Ninja: Add API to check for dyndep support 0488ae63 Ninja: Refactor ninja feature detection f0a23aa3 Ninja: Refactor Fortran rejection logic --- Summary of changes: Help/generator/Ninja.rst | 10 + Help/release/dev/ninja-fortran.rst|6 + Modules/Compiler/GNU-Fortran.cmake|3 + Modules/Compiler/Intel-Fortran.cmake |3 + Modules/Compiler/SunPro-Fortran.cmake |3 + Source/cmGlobalGenerator.cxx | 10 + Source/cmGlobalGenerator.h|2 + Source/cmGlobalNinjaGenerator.cxx | 506 - Source/cmGlobalNinjaGenerator.h | 16 ++ Source/cmNinjaTargetGenerator.cxx | 329 - Source/cmNinjaTargetGenerator.h | 15 + Source/cmcmd.cxx | 17 ++ 12 files changed, 910 insertions(+), 10 deletions(-) create mode 100644 Help/release/dev/ninja-fortran.rst 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.6.2-1129-g0314f26
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 0314f26412d3944f7ead47656e9347440141e815 (commit) via 0d8c5ba42a075184f4383c62bd91e67fd5c4ccf0 (commit) from 785f875426ec7aebb6583419515bf4e4c3975464 (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=0314f26412d3944f7ead47656e9347440141e815 commit 0314f26412d3944f7ead47656e9347440141e815 Merge: 785f875 0d8c5ba Author: Brad KingAuthorDate: Fri Sep 23 08:40:00 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 08:40:00 2016 -0400 Merge topic 'FindOpenSSL-path-order' 0d8c5ba4 FindOpenSSL: Search in more-specific directories before less-specific --- Summary of changes: Modules/FindOpenSSL.cmake | 12 ++-- 1 file changed, 6 insertions(+), 6 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.6.2-1143-g961536d
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 961536dc85b41f77db3d2d220cbf720d0056369a (commit) via 4d3874d5ad25d1907a56a92aba7ae94768726c72 (commit) via 86d2e4276d934c0e04ad129881d1cc9d2916d121 (commit) from c60fe3307591a76d498b4eae7ab8d801c65a709d (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=961536dc85b41f77db3d2d220cbf720d0056369a commit 961536dc85b41f77db3d2d220cbf720d0056369a Merge: c60fe33 4d3874d Author: Brad KingAuthorDate: Fri Sep 23 08:40:13 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 08:40:13 2016 -0400 Merge topic 'CheckFortranSourceCompiles-custom-ext' 4d3874d5 CheckFortranSourceCompiles: Add support for custom source extension 86d2e427 CheckFortranSourceCompiles: Fix FAIL_REGEX documentation typo --- Summary of changes: .../dev/CheckFortranSourceCompiles-custom-ext.rst |6 ++ Modules/CheckFortranSourceCompiles.cmake | 17 - 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 Help/release/dev/CheckFortranSourceCompiles-custom-ext.rst 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.6.2-1127-g785f875
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 785f875426ec7aebb6583419515bf4e4c3975464 (commit) via 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 (commit) from d0a27ae998e5ff313937f346b53d672c6353bd74 (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=785f875426ec7aebb6583419515bf4e4c3975464 commit 785f875426ec7aebb6583419515bf4e4c3975464 Merge: d0a27ae 48624b3 Author: Brad KingAuthorDate: Fri Sep 23 08:39:56 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 23 08:39:56 2016 -0400 Merge topic 'qtdialog-lib-paths' 48624b3c cmake-gui: Do not remove library paths for Qt5 plugins. --- Summary of changes: Source/QtDialog/CMakeSetup.cxx |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits