[Cmake-commits] CMake branch, master, updated. v3.6.2-881-gd62a5df
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 d62a5dfc86a4d0f48f93494065f7a835c9140bb6 (commit) from f506489d1ed222761f9ce752144a458290020e55 (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=d62a5dfc86a4d0f48f93494065f7a835c9140bb6 commit d62a5dfc86a4d0f48f93494065f7a835c9140bb6 Author: Kitware Robot AuthorDate: Fri Sep 9 00:01:05 2016 -0400 Commit: Kitware Robot CommitDate: Fri Sep 9 00:01:05 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 74f34b2..a0020d1 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 20160908) +set(CMake_VERSION_PATCH 20160909) #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-1881-g59edc3f
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 59edc3fb74ca1eb857601c63bb01c682c1a8466b (commit)
via cc6b948e5ea86996fe65014ce8f97bf92b46e4c0 (commit)
via 52052ef88b6f46a12c8430395ae8b419971fcb35 (commit)
via 3b3622305bb950f16f238f030c8f32786ad3511a (commit)
from 905f5f00754d5e3e632b829e4f4f2e4db6f64f52 (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=59edc3fb74ca1eb857601c63bb01c682c1a8466b
commit 59edc3fb74ca1eb857601c63bb01c682c1a8466b
Merge: 905f5f0 cc6b948
Author: Daniel Pfeifer
AuthorDate: Thu Sep 8 17:55:06 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 17:55:06 2016 -0400
Merge topic 'cmGeneratorTarget-cleanup' into next
cc6b948e cmGeneratorTarget: factor out common part of AddSources commands
52052ef8 cmGeneratorTarget: use erase-unique instead of reinitialization
3b362230 cmGeneratorTarget: don't clear container in destructor
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc6b948e5ea86996fe65014ce8f97bf92b46e4c0
commit cc6b948e5ea86996fe65014ce8f97bf92b46e4c0
Author: Daniel Pfeifer
AuthorDate: Wed Sep 7 21:14:29 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Thu Sep 8 23:47:16 2016 +0200
cmGeneratorTarget: factor out common part of AddSources commands
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4baec03..7dd8e7f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -468,9 +468,8 @@ std::string cmGeneratorTarget::GetOutputName(const
std::string& config,
return i->second;
}
-void cmGeneratorTarget::AddSource(const std::string& src)
+void cmGeneratorTarget::AddSourceCommon(const std::string& src)
{
- this->Target->AddSource(src);
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
cmGeneratorExpression ge(lfbt);
CM_AUTO_PTR cge = ge.Parse(src);
@@ -480,19 +479,17 @@ void cmGeneratorTarget::AddSource(const std::string& src)
this->LinkImplementationLanguageIsContextDependent = true;
}
+void cmGeneratorTarget::AddSource(const std::string& src)
+{
+ this->Target->AddSource(src);
+ this->AddSourceCommon(src);
+}
+
void cmGeneratorTarget::AddTracedSources(std::vector const& srcs)
{
this->Target->AddTracedSources(srcs);
if (!srcs.empty()) {
-std::string srcFiles = cmJoin(srcs, ";");
-this->SourceFilesMap.clear();
-this->LinkImplementationLanguageIsContextDependent = true;
-cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-cmGeneratorExpression ge(lfbt);
-CM_AUTO_PTR cge = ge.Parse(srcFiles);
-cge->SetEvaluateForBuildsystem(true);
-this->SourceEntries.push_back(
- new cmGeneratorTarget::TargetPropertyEntry(cge));
+this->AddSourceCommon(cmJoin(srcs, ";"));
}
}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 173f15d..715220e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -540,6 +540,8 @@ public:
std::string GetFortranModuleDirectory() const;
private:
+ void AddSourceCommon(const std::string& src);
+
std::string CreateFortranModuleDirectory() const;
mutable bool FortranModuleDirectoryCreated;
mutable std::string FortranModuleDirectory;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52052ef88b6f46a12c8430395ae8b419971fcb35
commit 52052ef88b6f46a12c8430395ae8b419971fcb35
Author: Daniel Pfeifer
AuthorDate: Wed Sep 7 21:03:18 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Thu Sep 8 23:46:45 2016 +0200
cmGeneratorTarget: use erase-unique instead of reinitialization
Just to make it easier to find places where containers are cleared in
order to be recomputed.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 25917f8..4baec03 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -839,14 +839,10 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(
&dagChecker, result, excludeImported);
}
-std::set unique;
-for (std::vector::iterator li = result.begin();
- li != result.end(); ++li) {
- cmSystemTools::ConvertToUnixSlashes(*li);
- unique.insert(*li);
-}
-result.clear();
-result.insert(result.end(), unique.begin(), unique.end());
+std::for_each(result.begin(), result.end(),
+ cmSystemTools::ConvertToUnixSlashes);
+std::sort(result.begin(), result.end());
+result.erase(std::unique(result.begin(), result.end()), result.end());
IncludeCacheType::value_type entry(config_upper, result);
iter = this->System
[Cmake-commits] CMake branch, next, updated. v3.6.2-1877-g905f5f0
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 905f5f00754d5e3e632b829e4f4f2e4db6f64f52 (commit)
via befb6a645026bd7f64b6dc1dc1d370114f501375 (commit)
via 3dde29bc72ad3b3f4cba6fc300df077fd4dc2a5c (commit)
via 5d3b5bef11bc29bb00a14103433fea81e4dcc340 (commit)
via ad42eb33b61ad262315bfa087dc7f4f0ddbca5fe (commit)
from d803aae6f865545c4cc0702a52f73871aaf1de0e (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=905f5f00754d5e3e632b829e4f4f2e4db6f64f52
commit 905f5f00754d5e3e632b829e4f4f2e4db6f64f52
Merge: d803aae befb6a6
Author: Daniel Pfeifer
AuthorDate: Thu Sep 8 17:43:58 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 17:43:58 2016 -0400
Merge topic 'clang-tidy' into next
befb6a64 cmDependsFortran: simplify boolean expression
3dde29bc cmSystemTools: simplify boolean expressions
5d3b5bef QCMakeCacheView: simplify boolean expression
ad42eb33 QCMakeCacheView: no else after return
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=befb6a645026bd7f64b6dc1dc1d370114f501375
commit befb6a645026bd7f64b6dc1dc1d370114f501375
Author: Daniel Pfeifer
AuthorDate: Thu Sep 8 23:43:06 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Thu Sep 8 23:43:06 2016 +0200
cmDependsFortran: simplify boolean expression
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index b7e006d..eb4c1ec 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -712,10 +712,5 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
// Compare the remaining content. If no compiler id matched above,
// including the case none was given, this will compare the whole
// content.
- if (!cmFortranStreamsDiffer(finModFile, finStampFile)) {
-return false;
- }
-
- // The modules are different.
- return true;
+ return cmFortranStreamsDiffer(finModFile, finStampFile);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dde29bc72ad3b3f4cba6fc300df077fd4dc2a5c
commit 3dde29bc72ad3b3f4cba6fc300df077fd4dc2a5c
Author: Daniel Pfeifer
AuthorDate: Thu Sep 8 23:41:31 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Thu Sep 8 23:41:31 2016 +0200
cmSystemTools: simplify boolean expressions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 7da9975..ae0323b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1766,9 +1766,7 @@ bool cmSystemTools::CopyFileTime(const char* fromFile,
const char* toFile)
if (!GetFileTime(hFrom, &timeCreation, &timeLastAccess, &timeLastWrite)) {
return false;
}
- if (!SetFileTime(hTo, &timeCreation, &timeLastAccess, &timeLastWrite)) {
-return false;
- }
+ return SetFileTime(hTo, &timeCreation, &timeLastAccess, &timeLastWrite);
#else
struct stat fromStat;
if (stat(fromFile, &fromStat) < 0) {
@@ -1778,11 +1776,8 @@ bool cmSystemTools::CopyFileTime(const char* fromFile,
const char* toFile)
struct utimbuf buf;
buf.actime = fromStat.st_atime;
buf.modtime = fromStat.st_mtime;
- if (utime(toFile, &buf) < 0) {
-return false;
- }
+ return utime(toFile, &buf) >= 0;
#endif
- return true;
}
cmSystemToolsFileTime* cmSystemTools::FileTimeNew()
@@ -1828,16 +1823,11 @@ bool cmSystemTools::FileTimeSet(const char* fname,
cmSystemToolsFileTime* t)
if (!h) {
return false;
}
- if (!SetFileTime(h, &t->timeCreation, &t->timeLastAccess,
- &t->timeLastWrite)) {
-return false;
- }
+ return SetFileTime(h, &t->timeCreation, &t->timeLastAccess,
+ &t->timeLastWrite);
#else
- if (utime(fname, &t->timeBuf) < 0) {
-return false;
- }
+ return utime(fname, &t->timeBuf) >= 0;
#endif
- return true;
}
#ifdef _WIN32
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d3b5bef11bc29bb00a14103433fea81e4dcc340
commit 5d3b5bef11bc29bb00a14103433fea81e4dcc340
Author: Daniel Pfeifer
AuthorDate: Thu Sep 8 23:35:59 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Thu Sep 8 23:35:59 2016 +0200
QCMakeCacheView: simplify boolean expression
diff --git a/Source/QtDialog/QCMakeCacheView.cxx
b/Source/QtDialog/QCMakeCacheView.cxx
index ec7918b..ed11f7b 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -95,10 +95,7 @@ protected:
// if there are no children
if (!m->hasChildren(idx)) {
bool adv = m->data(idx, QCMakeCacheModel::AdvancedRole).toBool();
- if (!adv || (adv && this->ShowAdvanced)) {
-return true;
- }
- return false;
+ return !adv || this->ShowAdvanced;
[Cmake-commits] CMake branch, next, updated. v3.6.2-1872-gd803aae
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 d803aae6f865545c4cc0702a52f73871aaf1de0e (commit) via b3e62a0507a3cd749d9add0a5c926aa823e91827 (commit) from 3fad31b0c32aecf07dc29857e26ee3a803ec154b (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=d803aae6f865545c4cc0702a52f73871aaf1de0e commit d803aae6f865545c4cc0702a52f73871aaf1de0e Merge: 3fad31b b3e62a0 Author: Roger Leigh AuthorDate: Thu Sep 8 17:01:48 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 17:01:48 2016 -0400 Merge topic 'bzip2-imported-targets' into next b3e62a05 FindBZip2: Document imported target https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3e62a0507a3cd749d9add0a5c926aa823e91827 commit b3e62a0507a3cd749d9add0a5c926aa823e91827 Author: Roger Leigh AuthorDate: Thu Sep 8 22:01:02 2016 +0100 Commit: Roger Leigh CommitDate: Thu Sep 8 22:01:02 2016 +0100 FindBZip2: Document imported target diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index ca7761d..152d812 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -4,7 +4,16 @@ # # Try to find BZip2 # -# Once done this will define +# IMPORTED Targets +# +# +# This module defines :prop_tgt:`IMPORTED` target ``BZip2::BZip2``, if +# BZip2 has been found. +# +# Result Variables +# +# +# This module defines the following variables: # # :: # --- Summary of changes: Modules/FindBZip2.cmake | 11 ++- 1 file changed, 10 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.6.2-1868-gb4ab772
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 b4ab772483a971880e4e2baa844dfa40124e8332 (commit)
via 30d13fa92cafd44e84a5e3b95373a21f2373afce (commit)
via efe622be144df37eeb0d09c924cd9ccd38b91b09 (commit)
from 6f43ab3049540f3a0c62c50d9e6b43f10fa57897 (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=b4ab772483a971880e4e2baa844dfa40124e8332
commit b4ab772483a971880e4e2baa844dfa40124e8332
Merge: 6f43ab3 30d13fa
Author: Roger Leigh
AuthorDate: Thu Sep 8 16:57:00 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 16:57:00 2016 -0400
Merge topic 'bzip2-imported-targets' into next
30d13fa9 Tests: Add FindBZip2 unit tests
efe622be FindBZip2: Add imported target
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30d13fa92cafd44e84a5e3b95373a21f2373afce
commit 30d13fa92cafd44e84a5e3b95373a21f2373afce
Author: Roger Leigh
AuthorDate: Thu Sep 8 21:28:17 2016 +0100
Commit: Roger Leigh
CommitDate: Thu Sep 8 21:54:43 2016 +0100
Tests: Add FindBZip2 unit tests
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8293286..aeff249 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1356,6 +1356,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
add_subdirectory(FindBoost)
endif()
+ if(CMake_TEST_FindBZip2)
+add_subdirectory(FindBZip2)
+ endif()
+
if(CMake_TEST_FindGSL)
add_subdirectory(FindGSL)
endif()
diff --git a/Tests/FindBZip2/CMakeLists.txt b/Tests/FindBZip2/CMakeLists.txt
new file mode 100644
index 000..0eb3b99
--- /dev/null
+++ b/Tests/FindBZip2/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_test(NAME FindBZip2.Test COMMAND
+ ${CMAKE_CTEST_COMMAND} -C $
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/FindBZip2/Test"
+ "${CMake_BINARY_DIR}/Tests/FindBZip2/Test"
+ ${build_generator_args}
+ --build-project TestFindBZip2
+ --build-options ${build_options}
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $
+ )
diff --git a/Tests/FindBZip2/Test/CMakeLists.txt
b/Tests/FindBZip2/Test/CMakeLists.txt
new file mode 100644
index 000..e9cb618
--- /dev/null
+++ b/Tests/FindBZip2/Test/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.4)
+project(TestFindBZip2 C)
+include(CTest)
+
+find_package(BZip2 REQUIRED)
+
+add_definitions(-DCMAKE_EXPECTED_BZip2_VERSION="${BZip2_VERSION_STRING}")
+
+add_executable(test_tgt main.c)
+target_link_libraries(test_tgt BZip2::BZip2)
+add_test(NAME test_tgt COMMAND test_tgt)
+
+add_executable(test_var main.c)
+target_include_directories(test_var PRIVATE ${BZIP2_INCLUDE_DIRS})
+target_link_libraries(test_var PRIVATE ${BZIP2_LIBRARIES})
+add_test(NAME test_var COMMAND test_var)
diff --git a/Tests/FindBZip2/Test/main.c b/Tests/FindBZip2/Test/main.c
new file mode 100644
index 000..f8d1ddc
--- /dev/null
+++ b/Tests/FindBZip2/Test/main.c
@@ -0,0 +1,23 @@
+#include
+#include
+#include
+
+int main()
+{
+ int chunksize = 1024;
+ FILE *file = fopen("test.bzip2", "wb");
+ char *buf = malloc(sizeof(char) * chunksize);
+ int error, rsize;
+ unsigned int in, out;
+ BZFILE *bzfile = BZ2_bzWriteOpen(&error, file, 64, 1, 10);
+
+ /* Don't actually write anything for the purposes of the test */
+
+ BZ2_bzWriteClose(&error, bzfile, 1, &in, &out);
+ free(buf);
+ fclose(file);
+
+ remove("test.bzip2");
+
+ return 0;
+}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efe622be144df37eeb0d09c924cd9ccd38b91b09
commit efe622be144df37eeb0d09c924cd9ccd38b91b09
Author: Roger Leigh
AuthorDate: Thu Sep 8 21:16:09 2016 +0100
Commit: Roger Leigh
CommitDate: Thu Sep 8 21:16:09 2016 +0100
FindBZip2: Add imported target
diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index b670025..ca7761d 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -64,6 +64,31 @@ if (BZIP2_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${BZIP2_LIBRARIES})
CHECK_SYMBOL_EXISTS(BZ2_bzCompressInit "bzlib.h" BZIP2_NEED_PREFIX)
cmake_pop_check_state()
+
+if(NOT TARGET BZip2::BZip2)
+ add_library(BZip2::BZip2 UNKNOWN IMPORTED)
+ set_target_properties(BZip2::BZip2 PROPERTIES
+INTERFACE_INCLUDE_DIRECTORIES "${BZIP2_INCLUDE_DIRS}")
+
+ if(BZIP2_LIBRARY_RELEASE)
+set_property(TARGET BZip2::BZip2 APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(BZip2::BZip2 PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${BZIP2_LIBRARY_RELEASE}")
+ endif()
+
+ if(BZIP2_LIBRARY_DEBUG)
+set_property(TARGET BZip2::BZip2 APPEND PROPERTY
+
[Cmake-commits] CMake branch, next, updated. v3.6.2-1870-g3fad31b
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 3fad31b0c32aecf07dc29857e26ee3a803ec154b (commit) via d63ea37483c7f4b21e9b6e0f792c57ed7d567584 (commit) from b4ab772483a971880e4e2baa844dfa40124e8332 (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=3fad31b0c32aecf07dc29857e26ee3a803ec154b commit 3fad31b0c32aecf07dc29857e26ee3a803ec154b Merge: b4ab772 d63ea37 Author: Roger Leigh AuthorDate: Thu Sep 8 16:57:16 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 16:57:16 2016 -0400 Merge topic 'freebsd-kvm-link' into next d63ea374 Utilities: cmlibuv: Link with kvm on FreeBSD https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d63ea37483c7f4b21e9b6e0f792c57ed7d567584 commit d63ea37483c7f4b21e9b6e0f792c57ed7d567584 Author: Roger Leigh AuthorDate: Thu Sep 8 21:55:36 2016 +0100 Commit: Roger Leigh CommitDate: Thu Sep 8 21:55:36 2016 +0100 Utilities: cmlibuv: Link with kvm on FreeBSD diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt index e25ac82..8837be6 100644 --- a/Utilities/cmlibuv/CMakeLists.txt +++ b/Utilities/cmlibuv/CMakeLists.txt @@ -168,6 +168,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND uv_libraries +kvm +) list(APPEND uv_headers include/uv-bsd.h ) --- Summary of changes: Utilities/cmlibuv/CMakeLists.txt |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.6.2-1865-g6f43ab3
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 6f43ab3049540f3a0c62c50d9e6b43f10fa57897 (commit)
via b00a344d11386940bb57c9e4321d95a82555f044 (commit)
from 37d5107091a9713090f73406b87053a05817c882 (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=6f43ab3049540f3a0c62c50d9e6b43f10fa57897
commit 6f43ab3049540f3a0c62c50d9e6b43f10fa57897
Merge: 37d5107 b00a344
Author: Brad King
AuthorDate: Thu Sep 8 14:59:47 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 14:59:47 2016 -0400
Merge topic 'geh-failure-tests' into next
b00a344d Maybe skip GenerateExportHeader failure tests
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b00a344d11386940bb57c9e4321d95a82555f044
commit b00a344d11386940bb57c9e4321d95a82555f044
Author: Matthew Woehlke
AuthorDate: Thu Sep 8 14:47:18 2016 -0400
Commit: Matthew Woehlke
CommitDate: Thu Sep 8 14:47:18 2016 -0400
Maybe skip GenerateExportHeader failure tests
When setting up the failure tests for GenerateExportHeader, check if the
compiler actually hides non-exported stuff. If not, the failure tests
won't fail, and will cause the overall test to fail. (Since this
typically is only the case for very old compilers, simply skipping them
as opposed to trying to do something more fine grained seems reasonably
safe.)
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
b/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
index 88853b3..7182cdf 100644
--- a/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
+++ b/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
@@ -2,6 +2,13 @@ set(failure_test_executables
${CMAKE_CURRENT_BINARY_DIR}/failure_test_targets)
file(WRITE ${failure_test_executables} "")
+# Check if we should do anything. If the compiler doesn't support hidden
+# visibility, the failure tests won't fail, so just write an empty targets
+# list and punt.
+if(NOT WIN32 AND NOT CYGWIN AND NOT COMPILER_HAS_HIDDEN_VISIBILITY)
+ return()
+endif()
+
# Read the input source file
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/exportheader_test.cpp content_post)
set(content_pre "")
---
Summary of changes:
Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake |7 +++
1 file changed, 7 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-1863-g37d5107
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 37d5107091a9713090f73406b87053a05817c882 (commit)
via ed92af3a7a746dfeb395b9fd783791fcae2b062f (commit)
via 35447174ccece96d1b4e6304b94a31e03064500b (commit)
via 15928265868c8bb7afba6d4ce9f2f27b56d685d5 (commit)
from 28d08a9e6b7eb2f45773dc5754828eb8de35aa0a (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=37d5107091a9713090f73406b87053a05817c882
commit 37d5107091a9713090f73406b87053a05817c882
Merge: 28d08a9 ed92af3
Author: Brad King
AuthorDate: Thu Sep 8 11:54:10 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 11:54:10 2016 -0400
Merge topic 'geh-failure-tests' into next
ed92af3a Refactor GenerateExportHeader test code
35447174 Add data tests to GenerateExportHeader test
15928265 Add failure test for GenerateExportHeader
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed92af3a7a746dfeb395b9fd783791fcae2b062f
commit ed92af3a7a746dfeb395b9fd783791fcae2b062f
Author: Matthew Woehlke
AuthorDate: Fri Sep 2 16:53:34 2016 -0400
Commit: Matthew Woehlke
CommitDate: Wed Sep 7 10:47:22 2016 -0400
Refactor GenerateExportHeader test code
Refactor the library code used in the GenerateExportHeader test to use
an improved naming convention that more directly identifies what it
being tested, making use of namespaces to avoid possible symbol
collisions. This also eliminates duplicate cases such as `libshared()`
and `libshared_not_exported()` which had the same decoration, and adds
consistent pairings of _EXPORT and _DEPRECATED_EXPORT which
were missing previously. The data tests from the previous commit are
also added to `libstatic` and `libshared_and_static` for consistency.
Note that there are no exported members of exported classes, as these
are not allowed on Windows.
diff --git a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
index f3f2da9..4ba6abd 100644
--- a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
@@ -56,19 +56,29 @@ void compare(const char* refName, const char* testName)
int main()
{
{
-Libshared l;
-l.libshared();
-l.libshared_exported();
-l.libshared_deprecated();
-l.libshared_not_exported();
+libshared::Class l;
+//l.method(); LINK ERROR
+l.method_exported();
+//l.method_deprecated(); LINK ERROR
+l.method_deprecated_exported();
+//l.method_excluded(); LINK ERROR
+
+//use_int(l.data); LINK ERROR
+use_int(l.data_exported);
+//use_int(l.data_excluded); LINK ERROR
+ }
+
+ {
+libshared::ExportedClass l;
+l.method();
+l.method_deprecated();
#ifdef _WIN32
-l.libshared_excluded();
+l.method_excluded();
#else
-//l.libshared_excluded(); LINK ERROR (NOT WIN32)
+//l.method_excluded(); LINK ERROR (NOT WIN32)
#endif
-use_int(l.data_exported);
-use_int(l.data_not_exported);
+use_int(l.data);
#ifdef _WIN32
use_int(l.data_excluded);
#else
@@ -77,71 +87,76 @@ int main()
}
{
-LibsharedNotExported l;
-//l.libshared(); LINK ERROR
-l.libshared_exported();
-l.libshared_deprecated();
-//l.libshared_not_exported(); LINK ERROR
-//l.libshared_excluded(); LINK ERROR
-
-use_int(l.data_exported);
-//use_int(l.data_not_exported); LINK ERROR
-//use_int(l.data_excluded); LINK ERROR
- }
-
- {
-LibsharedExcluded l;
-//l.libshared(); LINK ERROR
-l.libshared_exported();
-l.libshared_deprecated();
-//l.libshared_not_exported(); LINK ERROR
-//l.libshared_excluded(); LINK ERROR
-
+libshared::ExcludedClass l;
+//l.method(); LINK ERROR
+l.method_exported();
+//l.method_deprecated(); LINK ERROR
+l.method_deprecated_exported();
+//l.method_excluded(); LINK ERROR
+
+//use_int(l.data); LINK ERROR
use_int(l.data_exported);
-//use_int(l.data_not_exported); LINK ERROR
//use_int(l.data_excluded); LINK ERROR
}
- libshared_exported();
- libshared_deprecated();
- //libshared_not_exported(); LINK ERROR
- //libshared_excluded(); LINK ERROR
+ //libshared::function(); LINK ERROR
+ libshared::function_exported();
+ //libshared::function_deprecated(); LINK ERROR
+ libshared::function_deprecated_exported();
+ //libshared::function_excluded(); LINK ERROR
- use_int(data_exported);
- //use_int(data_not_exported); LINK ERROR
- //use_int(data_excluded); LINK ERROR
+ //use_int(libshared::data); L
[Cmake-commits] CMake branch, next, updated. v3.6.2-1859-g28d08a9
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 28d08a9e6b7eb2f45773dc5754828eb8de35aa0a (commit)
via cb299acc27d5f80b2fc801f0f57358ec9f0303d1 (commit)
from efcbc372ca2b964154bcdcb7f43e382aafd22d2d (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=28d08a9e6b7eb2f45773dc5754828eb8de35aa0a
commit 28d08a9e6b7eb2f45773dc5754828eb8de35aa0a
Merge: efcbc37 cb299ac
Author: Brad King
AuthorDate: Thu Sep 8 11:34:33 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 11:34:33 2016 -0400
Merge topic 'parse_arguments_argv_n' into next
cb299acc cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb299acc27d5f80b2fc801f0f57358ec9f0303d1
commit cb299acc27d5f80b2fc801f0f57358ec9f0303d1
Author: Bill Hoffman
AuthorDate: Wed Sep 7 16:47:23 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 8 11:33:46 2016 -0400
cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#
The `ARGC`/`ARGV#` variables in function scope hold the original
arguments with no ;-list flattening. Add a way for functions to
cleanly parse arguments that may contain `;`. This also avoids
extra copying of the arguments.
Co-Author: Brad King
diff --git a/Help/command/cmake_parse_arguments.rst
b/Help/command/cmake_parse_arguments.rst
index 6206611..ec4ffed 100644
--- a/Help/command/cmake_parse_arguments.rst
+++ b/Help/command/cmake_parse_arguments.rst
@@ -11,6 +11,17 @@ respective options.
cmake_parse_arguments(
args...)
+ cmake_parse_arguments(PARSE_ARGV N
+)
+
+The first signature reads processes arguments passed in the ``args...``.
+This may be used in either a :command:`macro` or a :command:`function`.
+
+The ``PARSE_ARGV`` signature is only for use in a :command:`function`
+body. In this case the arguments that are parsed come from the
+``ARGV#`` variables of the calling function. The parsing starts with
+the Nth argument, where ``N`` is an unsigned integer. This allows for
+the values to have special characters like ``;`` in them.
The argument contains all options for the respective macro,
i.e. keywords which can be used when calling the macro without any value
diff --git a/Help/release/dev/parse_arguments_argv_n.rst
b/Help/release/dev/parse_arguments_argv_n.rst
new file mode 100644
index 000..758b72a
--- /dev/null
+++ b/Help/release/dev/parse_arguments_argv_n.rst
@@ -0,0 +1,6 @@
+parse_arguments_argv_n
+--
+
+* The :command:`cmake_parse_arguments` command gained a new
+ mode to read arguments directly from ``ARGC`` and ``ARGV#``
+ variables inside a :command:`function` body.
diff --git a/Source/cmParseArgumentsCommand.cxx
b/Source/cmParseArgumentsCommand.cxx
index 8f524ec..f9313c5 100644
--- a/Source/cmParseArgumentsCommand.cxx
+++ b/Source/cmParseArgumentsCommand.cxx
@@ -20,6 +20,8 @@ bool
cmParseArgumentsCommand::InitialPass(std::vector const& args,
{
// cmake_parse_arguments(prefix options single multi )
// 1 2 3 4
+ // or
+ // cmake_parse_arguments(PARSE_ARGV N prefix options single multi)
if (args.size() < 4) {
this->SetError("must be called with at least 4 arguments.");
return false;
@@ -27,6 +29,27 @@ bool
cmParseArgumentsCommand::InitialPass(std::vector const& args,
std::vector::const_iterator argIter = args.begin(),
argEnd = args.end();
+ bool parseFromArgV = false;
+ unsigned long argvStart = 0;
+ if (*argIter == "PARSE_ARGV") {
+if (args.size() != 6) {
+ this->Makefile->IssueMessage(
+cmake::FATAL_ERROR,
+"PARSE_ARGV must be called with exactly 6 arguments.");
+ cmSystemTools::SetFatalErrorOccured();
+ return true;
+}
+parseFromArgV = true;
+argIter++; // move past PARSE_ARGV
+if (!cmSystemTools::StringToULong(argIter->c_str(), &argvStart)) {
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR, "PARSE_ARGV index '" +
+ *argIter +
+ "' is not an unsigned integer");
+ cmSystemTools::SetFatalErrorOccured();
+ return true;
+}
+argIter++; // move past N
+ }
// the first argument is the prefix
const std::string prefix = (*argIter++) + "_";
@@ -90,11 +113,37 @@ bool
cmParseArgumentsCommand::InitialPass(std::vector const& args,
} insideValues = NONE;
std::string currentArgName;
- // Flatten ;-lists in the arg
[Cmake-commits] CMake branch, next, updated. v3.6.2-1857-gefcbc37
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 efcbc372ca2b964154bcdcb7f43e382aafd22d2d (commit) via f2c98e125fe0d7d59ce3ff58928d20ad41066685 (commit) via e83b96b793dbe9d525fc878f7e8df8304079e35d (commit) via aa6682802eecd0434088c16b51d198fea619b76d (commit) from 951d17d1883a8853d5054dc7bb4771e1006a78eb (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=efcbc372ca2b964154bcdcb7f43e382aafd22d2d commit efcbc372ca2b964154bcdcb7f43e382aafd22d2d Merge: 951d17d f2c98e1 Author: Brad King AuthorDate: Thu Sep 8 09:51:32 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 09:51:32 2016 -0400 Merge topic 'update-kwiml' into next f2c98e12 Merge branch 'upstream-KWIML' into update-kwiml e83b96b7 KWIML 2016-09-08 (d564b3c7) aa668280 kwiml: Update import script for new upstream URL https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2c98e125fe0d7d59ce3ff58928d20ad41066685 commit f2c98e125fe0d7d59ce3ff58928d20ad41066685 Merge: aa66828 e83b96b Author: Brad King AuthorDate: Thu Sep 8 09:50:05 2016 -0400 Commit: Brad King CommitDate: Thu Sep 8 09:50:31 2016 -0400 Merge branch 'upstream-KWIML' into update-kwiml * upstream-KWIML: KWIML 2016-09-08 (d564b3c7) Closes: #16290 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e83b96b793dbe9d525fc878f7e8df8304079e35d commit e83b96b793dbe9d525fc878f7e8df8304079e35d Author: KWIML Upstream AuthorDate: Thu Sep 8 09:28:56 2016 -0400 Commit: Brad King CommitDate: Thu Sep 8 09:50:04 2016 -0400 KWIML 2016-09-08 (d564b3c7) Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit d564b3c71a6dcec9b1cd84afb498b14a69307780 (master). Upstream Shortlog - Brad King (1): d564b3c7 Update copyright year Richard W.M. Jones (1): 12f000d5 abi.h: Add RISC-V, a little-endian architecture. diff --git a/Copyright.txt b/Copyright.txt index a6204b0..515c4eb 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -1,5 +1,5 @@ Kitware Information Macro Library -Copyright 2010-2015 Kitware, Inc. +Copyright 2010-2016 Kitware, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/include/kwiml/abi.h b/include/kwiml/abi.h index 3626361..5ffd542 100644 --- a/include/kwiml/abi.h +++ b/include/kwiml/abi.h @@ -1,6 +1,6 @@ /* Kitware Information Macro Library - Copyright 2010-2015 Kitware, Inc. + Copyright 2010-2016 Kitware, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -467,6 +467,10 @@ suppression macro KWIML_ABI_NO_VERIFY was defined. #elif defined(__XTENSA_EL__) # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE +/* RISC-V */ +#elif defined(__riscv__) +# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE + /* Unknown CPU */ #elif !defined(KWIML_ABI_NO_ERROR_ENDIAN) # error "Byte order of target CPU unknown." diff --git a/include/kwiml/int.h b/include/kwiml/int.h index b297ace..489c603 100644 --- a/include/kwiml/int.h +++ b/include/kwiml/int.h @@ -1,6 +1,6 @@ /* Kitware Information Macro Library - Copyright 2010-2015 Kitware, Inc. + Copyright 2010-2016 Kitware, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/version.h.in b/src/version.h.in index e58e0dc..0ac8854 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,6 +1,6 @@ /* Kitware Information Macro Library - Copyright 2010-2015 Kitware, Inc. + Copyright 2010-2016 Kitware, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa6682802eecd0434088c16b51d198fea619b76d commit aa6682802eecd0434088c16b51d198fea619b76d Author: Brad King AuthorDate: Thu Sep 8 09:49:01 2016 -0400 Commit: Brad King CommitDate: Thu Sep 8 09:49:39 2016 -0400 kwiml: Update import script for new upstream URL diff --git a/Utilities/Scripts/update-kwiml.bash b/Utilities/Scripts/update-kwiml.bash index 5c0d192..4497c92 100755 --- a/Utilities/Scripts/update-kwiml.bash +++ b/Utilities/Scripts/update-kwiml.bash @@ -7,7 +7,7 @@ shopt -s dotglob readonly name="KWIML" readonly ownership="KWIML Upstream " read
[Cmake-commits] CMake branch, next, updated. v3.6.2-1853-g951d17d
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 951d17d1883a8853d5054dc7bb4771e1006a78eb (commit) via 52b95d8893fb288a4a787d668b8456c12e887d5c (commit) from 6b56c21dc954629c65f4586dda1fc0578c7061d2 (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=951d17d1883a8853d5054dc7bb4771e1006a78eb commit 951d17d1883a8853d5054dc7bb4771e1006a78eb Merge: 6b56c21 52b95d8 Author: Brad King AuthorDate: Thu Sep 8 09:44:13 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 09:44:13 2016 -0400 Merge topic 'fortran-scanbuild-fixes' into next 52b95d88 CTestCustom: Suppress scan-build warnings in flex-generated lexer https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52b95d8893fb288a4a787d668b8456c12e887d5c commit 52b95d8893fb288a4a787d668b8456c12e887d5c Author: Brad King AuthorDate: Thu Sep 8 09:43:33 2016 -0400 Commit: Brad King CommitDate: Thu Sep 8 09:43:33 2016 -0400 CTestCustom: Suppress scan-build warnings in flex-generated lexer diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index 1699492..8489178 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -81,6 +81,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION "index_encoder.c.241.2. warning: Value stored to .out_start. is never read" "index.c.*warning: Access to field.*results in a dereference of a null pointer.*loaded from variable.*" "cm_sha2.*warning: Value stored to.*is never read" + "cmFortranLexer.cxx:[0-9]+:[0-9]+: warning: Call to 'realloc' has an allocation size of 0 bytes" "testProcess.*warning: Dereference of null pointer .loaded from variable .invalidAddress.." "liblzma/simple/x86.c:[0-9]+:[0-9]+: warning: The result of the '<<' expression is undefined" "libuv/src/.*:[0-9]+:[0-9]+: warning: Dereference of null pointer" --- Summary of changes: CTestCustom.cmake.in |1 + 1 file changed, 1 insertion(+) 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-1851-g6b56c21
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 6b56c21dc954629c65f4586dda1fc0578c7061d2 (commit)
via 695f0d0d3a2db22d2ee3a426df8a1ec502cd471b (commit)
via 1619fb46a88accd1e6864f0c9de27ae2fd46541a (commit)
from 51f085974000d064b2bc1040aff7b934520c7656 (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=6b56c21dc954629c65f4586dda1fc0578c7061d2
commit 6b56c21dc954629c65f4586dda1fc0578c7061d2
Merge: 51f0859 695f0d0
Author: Brad King
AuthorDate: Thu Sep 8 09:41:40 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 09:41:40 2016 -0400
Merge topic 'fortran-parser-keywords' into next
695f0d0d cmFortranParser: Parse keywords as lexical tokens
1619fb46 cmFortranParser: Simplify grammar by skipping unknown statements
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=695f0d0d3a2db22d2ee3a426df8a1ec502cd471b
commit 695f0d0d3a2db22d2ee3a426df8a1ec502cd471b
Author: Brad King
AuthorDate: Mon Sep 5 15:54:51 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 8 09:40:02 2016 -0400
cmFortranParser: Parse keywords as lexical tokens
Teach the lexer to match and return specific Fortran keywords as tokens.
Update the parser to use these instead of always using a WORD token and
then checking the text. This avoids extra string comparisons and will
allow more grammar productions to be unambiguously added later for
additional Fortran statements.
diff --git a/Source/cmFortranLexer.cxx b/Source/cmFortranLexer.cxx
index 195c449..7bcd993 100644
--- a/Source/cmFortranLexer.cxx
+++ b/Source/cmFortranLexer.cxx
@@ -347,8 +347,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg
,yyscan_t yyscanner );
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 45
-#define YY_END_OF_BUFFER 46
+#define YY_NUM_RULES 50
+#define YY_END_OF_BUFFER 51
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -356,27 +356,30 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[173] =
+static yyconst flex_int16_t yy_accept[199] =
{ 0,
0,0,0,0,0,0,0,0,0,0,
- 46, 40, 42, 41, 44,1, 40, 33,2, 35,
- 40, 41, 38, 40, 39, 40, 39, 42, 40, 41,
- 40, 39,9,8,9,4,3, 40,0, 10,
-0,0,0,0,0, 33, 33, 34, 36, 38,
- 40, 39,0, 43, 39,0,0,0, 12,0,
-0,0,0,0,0, 40,0, 11, 39,0,
-0,5,0,0,0, 29,0,0, 33, 33,
- 33, 33,0,0, 12, 12,0,0,0, 23,
-0,0,0,0,0,0,6,0,0,0,
+ 51, 45, 47, 46, 49,1, 45, 33,2, 35,
+ 45, 46, 38, 45, 44, 44, 44, 44, 44, 45,
+ 44, 47, 45, 46, 45, 44,9,8,9,4,
+3, 45,0, 10,0,0,0,0,0, 33,
+ 33, 34, 36, 38, 45, 44, 44, 44, 44, 44,
+0, 48, 44,0,0,0, 12,0,0,0,
+0,0,0, 45,0, 11, 44,0,0,5,
+0,0,0, 29,0,0, 33, 33, 33, 33,
+0,0, 39, 44, 44, 44, 43, 12, 12,0,
+
+0,0, 23,0,0,0,0,0,0,6,
+0,0,0,0,0,0,0,0,0, 44,
+ 44, 44,0,0,0,0,0,0,0,0,
+0,0,0,0, 30, 31,0,0,0,0,
+0,0, 44, 44, 44,0, 24, 25,0,0,
+0,0,0,0,0,0,0, 32, 27,0,
+0, 20,0, 44, 44, 42,0, 26, 21,0,
+0,0, 19,0,0, 18, 28,0,0, 40,
+ 44, 17, 22,0,7, 37,7, 15,0, 44,
+ 14, 16, 41,0,0,0, 13,0
-0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0, 30, 31,
-0,0,0,0,0,0,0, 24, 25,0,
-0,0,0,0,0,0,0,0, 32, 27,
-0,0, 20,0,0, 26, 21,0,0,0,
- 19,0,0, 18, 28,0,0, 17, 22,0,
-7, 37,7, 15,0, 14, 16,0,0,0,
- 13,0
} ;
st
[Cmake-commits] CMake branch, next, updated. v3.6.2-1848-g51f0859
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 51f085974000d064b2bc1040aff7b934520c7656 (commit) via f506489d1ed222761f9ce752144a458290020e55 (commit) via 988b3806b6ad2f28ebd6b582ce18928407d0b011 (commit) via 04657ee2f83cb446c5595090f256273a23be94a2 (commit) via 4c674eba7ab7d431f535639553be8dcce14276c4 (commit) from 279bd661894dc24b19e83e0d5de07ec2061e7552 (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=51f085974000d064b2bc1040aff7b934520c7656 commit 51f085974000d064b2bc1040aff7b934520c7656 Merge: 279bd66 f506489 Author: Brad King AuthorDate: Thu Sep 8 09:38:30 2016 -0400 Commit: Brad King CommitDate: Thu Sep 8 09:38:30 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, master, updated. v3.6.2-871-g04657ee
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 04657ee2f83cb446c5595090f256273a23be94a2 (commit) via 290e4ce8a89819d6617fa404513d8a1629cafea7 (commit) from 4c674eba7ab7d431f535639553be8dcce14276c4 (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=04657ee2f83cb446c5595090f256273a23be94a2 commit 04657ee2f83cb446c5595090f256273a23be94a2 Merge: 4c674eb 290e4ce Author: Brad King AuthorDate: Thu Sep 8 09:36:51 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 09:36:51 2016 -0400 Merge topic 'install-export-root-prefix' 290e4ce8 install: Fix computed import prefix in export files when it is "/" --- Summary of changes: Source/cmExportInstallFileGenerator.cxx |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, master, updated. v3.6.2-880-gf506489
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 f506489d1ed222761f9ce752144a458290020e55 (commit) via d28da906fed16ab7f45440db65c8c84e15b53996 (commit) via 8c65a5017fe6a6dfe6d57018e28decd7649588d4 (commit) via f70c71c5a9759324d9e610bc919832b7500fd116 (commit) via e11cd31fa0cce8210577ee46b6a33ee371f4fe64 (commit) from 988b3806b6ad2f28ebd6b582ce18928407d0b011 (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=f506489d1ed222761f9ce752144a458290020e55 commit f506489d1ed222761f9ce752144a458290020e55 Merge: 988b380 d28da90 Author: Brad King AuthorDate: Thu Sep 8 09:36:57 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 09:36:57 2016 -0400 Merge topic 'fortran-depend-cleanup' d28da906 cmFortranParser: Inject a newline at end-of-file when missing 8c65a501 cmFortranParser: Revise indentation style to match rest of CMake f70c71c5 cmFortranLexer: Update to flex 2.6 e11cd31f Fortran: Warn when dependency scanning fails to parse a source file --- Summary of changes: Source/.gitattributes |2 + Source/cmDependsFortran.cxx|6 + Source/cmFortranLexer.cxx | 1864 Source/cmFortranLexer.h| 147 ++-- Source/cmFortranLexer.in.l | 17 +- Source/cmFortranParser.cxx | 403 - Source/cmFortranParser.h |6 + Source/cmFortranParser.y | 162 ++-- Source/cmFortranParserImpl.cxx | 21 +- Source/cmFortranParserTokens.h | 28 +- 10 files changed, 1291 insertions(+), 1365 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-875-g988b380
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 988b3806b6ad2f28ebd6b582ce18928407d0b011 (commit)
via bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (commit)
via a8936656faa14b27173f90046fef6259dceaa321 (commit)
via 21346d3f12f6ec35680574df44430c7bfb2efecb (commit)
from 04657ee2f83cb446c5595090f256273a23be94a2 (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=988b3806b6ad2f28ebd6b582ce18928407d0b011
commit 988b3806b6ad2f28ebd6b582ce18928407d0b011
Merge: 04657ee bdc679a
Author: Brad King
AuthorDate: Thu Sep 8 09:36:54 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 09:36:54 2016 -0400
Merge topic 'vs-15-generator'
bdc679a8 VS15: Add Visual Studio 15 generator
a8936656 VS: Update v140 flag tables from VS 15 MSBuild files
21346d3f Features: Record features for VS 15 Preview 4
---
Summary of changes:
...ual Studio 14 2015.rst => Visual Studio 15.rst} | 10 +-
Help/manual/cmake-generators.7.rst |1 +
Help/release/dev/vs-15-generator.rst |4 +
Help/variable/MSVC_VERSION.rst |2 +-
Modules/Compiler/MSVC-CXX-FeatureTests.cmake |3 +
Source/CMakeLists.txt |2 +
Source/cmGlobalVisualStudio10Generator.cxx | 14 ++
Source/cmGlobalVisualStudio15Generator.cxx | 151
...nerator.h => cmGlobalVisualStudio15Generator.h} | 29 ++--
Source/cmGlobalVisualStudio7Generator.cxx | 12 ++
Source/cmGlobalVisualStudioGenerator.h |3 +-
Source/cmVS14CLFlagTable.h | 12 ++
Source/cmVS14LinkFlagTable.h | 17 ++-
Source/cmVisualStudioGeneratorOptions.cxx |1 +
Source/cmake.cxx |3 +
Source/cmparseMSBuildXML.py|3 +
.../RunCMake/GeneratorPlatform/RunCMakeTest.cmake |4 +-
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake |4 +-
Tests/VSExternalInclude/CMakeLists.txt |4 +-
19 files changed, 245 insertions(+), 34 deletions(-)
copy Help/generator/{Visual Studio 14 2015.rst => Visual Studio 15.rst} (66%)
create mode 100644 Help/release/dev/vs-15-generator.rst
create mode 100644 Source/cmGlobalVisualStudio15Generator.cxx
copy Source/{cmGlobalVisualStudio14Generator.h =>
cmGlobalVisualStudio15Generator.h} (62%)
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-869-g4c674eb
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 4c674eba7ab7d431f535639553be8dcce14276c4 (commit) via f9973166e82c3f5d8e05e2ab57aceb15ff267295 (commit) from 5d0d9b36f26221e2de96bce2afb6334f2b8e8454 (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=4c674eba7ab7d431f535639553be8dcce14276c4 commit 4c674eba7ab7d431f535639553be8dcce14276c4 Merge: 5d0d9b3 f997316 Author: Brad King AuthorDate: Thu Sep 8 09:36:47 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 09:36:47 2016 -0400 Merge topic 'ExternalData-repeat-file' f9973166 ExternalData: Tolerate files duplicated across multiple targets --- Summary of changes: Modules/ExternalData.cmake | 76 +- Tests/Module/ExternalData/CMakeLists.txt |1 + Tests/Module/ExternalData/Data5/CMakeLists.txt | 22 +++ Tests/Module/ExternalData/Data5/Data5Check.cmake |4 ++ 4 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 Tests/Module/ExternalData/Data5/CMakeLists.txt create mode 100644 Tests/Module/ExternalData/Data5/Data5Check.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, next, updated. v3.6.2-1843-g279bd66
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 279bd661894dc24b19e83e0d5de07ec2061e7552 (commit)
via 1031e5d99385317e74a4667da9865aebcb48bcbe (commit)
from ac75ecc1800c224c803b1de2af49f071b6aee36c (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=279bd661894dc24b19e83e0d5de07ec2061e7552
commit 279bd661894dc24b19e83e0d5de07ec2061e7552
Merge: ac75ecc 1031e5d
Author: Raffi Enficiaud
AuthorDate: Thu Sep 8 07:27:13 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 8 07:27:13 2016 -0400
Merge topic 'FindMatlab-regression-tests-print-on-error' into next
1031e5d9 FindMatlab: add verbosity to the nightly tests
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1031e5d99385317e74a4667da9865aebcb48bcbe
commit 1031e5d99385317e74a4667da9865aebcb48bcbe
Author: Raffi Enficiaud
AuthorDate: Thu Sep 8 13:26:42 2016 +0200
Commit: Raffi Enficiaud
CommitDate: Thu Sep 8 13:26:42 2016 +0200
FindMatlab: add verbosity to the nightly tests
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8293286..7f43ec7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1412,9 +1412,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
# Matlab module
if(CMake_TEST_FindMatlab)
-ADD_TEST_MACRO(FindMatlab.basic_checks ${CMAKE_CTEST_COMMAND} -C
$)
-ADD_TEST_MACRO(FindMatlab.versions_checks ${CMAKE_CTEST_COMMAND} -C
$)
-ADD_TEST_MACRO(FindMatlab.components_checks ${CMAKE_CTEST_COMMAND} -C
$)
+ADD_TEST_MACRO(FindMatlab.basic_checks ${CMAKE_CTEST_COMMAND} -V -C
$)
+ADD_TEST_MACRO(FindMatlab.versions_checks ${CMAKE_CTEST_COMMAND} -V -C
$)
+ADD_TEST_MACRO(FindMatlab.components_checks ${CMAKE_CTEST_COMMAND} -V -C
$)
endif()
find_package(GTK2 QUIET)
---
Summary of changes:
Tests/CMakeLists.txt |6 +++---
1 file 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
[Cmake-commits] CMake branch, next, updated. v3.6.2-1841-gac75ecc
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 ac75ecc1800c224c803b1de2af49f071b6aee36c (commit) via 5d0d9b36f26221e2de96bce2afb6334f2b8e8454 (commit) from 6dfacdc467dc87ef45a61359039003ba2f4a5d79 (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=ac75ecc1800c224c803b1de2af49f071b6aee36c commit ac75ecc1800c224c803b1de2af49f071b6aee36c Merge: 6dfacdc 5d0d9b3 Author: Raffi Enficiaud AuthorDate: Thu Sep 8 07:25:16 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 8 07:25:16 2016 -0400 Merge topic 'FindMatlab-regression-tests-print-on-error' into next 5d0d9b36 CMake Nightly Date Stamp --- 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
