[Cmake-commits] CMake branch, master, updated. v3.3.2-1261-g44f2ade
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 44f2ade2cb8474cfc3e9f593958557a8761d89c0 (commit) from 442d17ef6c50a3ffc83ed6a860dc05febd85f1b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44f2ade2cb8474cfc3e9f593958557a8761d89c0 commit 44f2ade2cb8474cfc3e9f593958557a8761d89c0 Author: Kitware Robot AuthorDate: Wed Sep 23 00:01:05 2015 -0400 Commit: Kitware Robot CommitDate: Wed Sep 23 00:01:05 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e43b424..1d0e89c 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 3) -set(CMake_VERSION_PATCH 20150922) +set(CMake_VERSION_PATCH 20150923) #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.3.2-3211-g0cea45e
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 0cea45e48783bb37d60f067c0e6a658b7ac84757 (commit)
via 9a4f884454348ee7711238c05563ca58855d (commit)
from 5a93c936996b87d748da707058b374f2f71e25ca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cea45e48783bb37d60f067c0e6a658b7ac84757
commit 0cea45e48783bb37d60f067c0e6a658b7ac84757
Merge: 5a93c93 9a4
Author: Brad King
AuthorDate: Tue Sep 22 16:21:31 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 16:21:31 2015 -0400
Merge topic 'install-generator-mf' into next
9a4f Revert topic 'install-generator-mf'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a4f884454348ee7711238c05563ca58855d
commit 9a4f884454348ee7711238c05563ca58855d
Author: Brad King
AuthorDate: Tue Sep 22 16:20:25 2015 -0400
Commit: Brad King
CommitDate: Tue Sep 22 16:20:34 2015 -0400
Revert topic 'install-generator-mf'
Propagation of cmMakefile pointers is not consistent with the
refactoring in progress elsewhere to separate configure-time and
generate-time structures.
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index d9e8823..333c2ff 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -27,9 +27,7 @@ static cmInstallTargetGenerator*
CreateInstallTargetGenerator(cmTarget& target,
{
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
- return new cmInstallTargetGenerator(
-target.GetMakefile(),
-target.GetName(),
+ return new cmInstallTargetGenerator(target.GetName(),
args.GetDestination().c_str(),
impLib, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
@@ -45,7 +43,6 @@ static cmInstallFilesGenerator* CreateInstallFilesGenerator(
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(mf);
return new cmInstallFilesGenerator(
-mf,
absFiles, args.GetDestination().c_str(),
programs, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
@@ -176,8 +173,7 @@ bool
cmInstallCommand::HandleScriptMode(std::vector const& args)
return false;
}
this->Makefile->AddInstallGenerator(
-new cmInstallScriptGenerator(this->Makefile,
- script.c_str(), false,
+new cmInstallScriptGenerator(script.c_str(), false,
component.c_str()));
}
else if(doing_code)
@@ -185,8 +181,7 @@ bool
cmInstallCommand::HandleScriptMode(std::vector const& args)
doing_code = false;
std::string code = args[i];
this->Makefile->AddInstallGenerator(
-new cmInstallScriptGenerator(this->Makefile,
- code.c_str(), true,
+new cmInstallScriptGenerator(code.c_str(), true,
component.c_str()));
}
}
@@ -1277,8 +1272,7 @@
cmInstallCommand::HandleDirectoryMode(std::vector const& args)
// Create the directory install generator.
this->Makefile->AddInstallGenerator(
-new cmInstallDirectoryGenerator(this->Makefile,
-dirs, destination,
+new cmInstallDirectoryGenerator(dirs, destination,
permissions_file.c_str(),
permissions_dir.c_str(),
configurations,
@@ -1408,7 +1402,6 @@ bool
cmInstallCommand::HandleExportMode(std::vector const& args)
// Create the export install generator.
cmInstallExportGenerator* exportGenerator =
new cmInstallExportGenerator(
- this->Makefile,
exportSet,
ica.GetDestination().c_str(),
ica.GetPermissions().c_str(), ica.GetConfigurations(),
diff --git a/Source/cmInstallDirectoryGenerator.cxx
b/Source/cmInstallDirectoryGenerator.cxx
index fb94d59..7593380 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -15,8 +15,7 @@
//
cmInstallDirectoryGenerator
-::cmInstallDirectoryGenerator(cmMakefile* mf,
- std::vector const& dirs,
+::cmInstallDirectoryGenerator(std::vector const& dirs,
[Cmake-commits] CMake branch, next, updated. v3.3.2-3209-g5a93c93
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 5a93c936996b87d748da707058b374f2f71e25ca (commit)
via d13758514cd69ac10e5351f2a56b5706df6a3a78 (commit)
from 0f5c8e098d6a0e5da25aaea60b089f7d11205ab1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a93c936996b87d748da707058b374f2f71e25ca
commit 5a93c936996b87d748da707058b374f2f71e25ca
Merge: 0f5c8e0 d137585
Author: Stephen Kelly
AuthorDate: Tue Sep 22 16:20:30 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 16:20:30 2015 -0400
Merge topic 'fix-forced-toolchain-dialect' into next
d1375851 Project: Don't require computed default dialect if compiler was
forced.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d13758514cd69ac10e5351f2a56b5706df6a3a78
commit d13758514cd69ac10e5351f2a56b5706df6a3a78
Author: Stephen Kelly
AuthorDate: Tue Sep 22 22:13:15 2015 +0200
Commit: Stephen Kelly
CommitDate: Tue Sep 22 22:13:15 2015 +0200
Project: Don't require computed default dialect if compiler was forced.
Commit 7235334a (Project: Determine default language dialect for the
compiler., 2015-09-15) introduced a mechanism to determine the default
dialect used for the running compiler. If conditions in
the -.cmake file are such that compile features for
that version of the compiler should be supported, the _DEFAULT_STANDARD
is set to the computed value.
However, the CMakeForceCompiler module allows users to bypass execution of
the
compiler by CMake. In that case, do not set the _DEFAULT_STANDARD variable
at
all, which effectively disables the compile-features where the module is
used.
No compile features have ever been recorded where the module is used so no
functionality is lost.
diff --git a/Modules/Compiler/AppleClang-C.cmake
b/Modules/Compiler/AppleClang-C.cmake
index 1db7d9e..5908c26 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -13,10 +13,12 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
- if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
-message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
+ if (NOT CMAKE_C_COMPILER_FORCED)
+if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
+ message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
+endif()
+set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
endif()
- set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
endif()
macro(cmake_record_c_compile_features)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake
b/Modules/Compiler/AppleClang-CXX.cmake
index 031851a..c4e342b 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -23,10 +23,12 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
- if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
-message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version
${CMAKE_CXX_COMPILER_VERSION}")
+ if (NOT CMAKE_CXX_COMPILER_FORCED)
+if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
+ message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set
for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version
${CMAKE_CXX_COMPILER_VERSION}")
+endif()
+set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
endif()
- set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
endif()
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
index ef3a46a..a2e81c1 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -18,10 +18,12 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
- if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
-message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
+ if (NOT CMAKE_C_COMPILER_FORCED)
+if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
+ message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
+endif()
+set(
[Cmake-commits] CMake branch, next, updated. v3.3.2-3207-g0f5c8e0
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 0f5c8e098d6a0e5da25aaea60b089f7d11205ab1 (commit)
via 3f6b267d17cddb67e4251bb0ff28bb1a21498417 (commit)
via e4b1728c2cd4feadad6122bef836f507e974d1aa (commit)
via d44cb3277ce4810acb223140b3aafc35a5c31893 (commit)
from 95c39028ede8b8ba988f6d0f6964b0f7ce2bf76b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5c8e098d6a0e5da25aaea60b089f7d11205ab1
commit 0f5c8e098d6a0e5da25aaea60b089f7d11205ab1
Merge: 95c3902 3f6b267
Author: Brad King
AuthorDate: Tue Sep 22 13:01:36 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 13:01:36 2015 -0400
Merge topic 'install-generator-mf' into next
3f6b267d cmInstallTargetGenerator: Simplify using Makefile member
e4b1728c cmInstallFilesGenerator: Drop LocalGenerator member
d44cb327 cmInstallGenerator: Add Makefile member
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f6b267d17cddb67e4251bb0ff28bb1a21498417
commit 3f6b267d17cddb67e4251bb0ff28bb1a21498417
Author: Brad King
AuthorDate: Tue Sep 22 11:16:59 2015 -0400
Commit: Brad King
CommitDate: Tue Sep 22 11:40:45 2015 -0400
cmInstallTargetGenerator: Simplify using Makefile member
We now have the cmMakefile in which install(TARGETS) was invoked
as a member so we do not need to look it up through the installed
target anymore.
diff --git a/Source/cmInstallTargetGenerator.cxx
b/Source/cmInstallTargetGenerator.cxx
index 7b2893c..f33dbb6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -77,7 +77,7 @@ void
cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
if(this->Target->NeedRelinkBeforeInstall(config))
{
fromDirConfig =
-this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
+this->Makefile->GetCurrentBinaryDirectory();
fromDirConfig += cmake::GetCMakeFilesDirectory();
fromDirConfig += "/CMakeRelink.dir/";
}
@@ -113,7 +113,7 @@ void
cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
case cmTarget::UTILITY:
case cmTarget::GLOBAL_TARGET:
case cmTarget::UNKNOWN_LIBRARY:
- this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
+ this->Makefile->IssueMessage(cmake::INTERNAL_ERROR,
"cmInstallTargetGenerator created with non-installable target.");
return;
}
@@ -351,8 +351,7 @@ std::string
cmInstallTargetGenerator::GetDestination(std::string const& config) const
{
cmGeneratorExpression ge;
- return ge.Parse(this->Destination)
-->Evaluate(this->Target->Target->GetMakefile(), config);
+ return ge.Parse(this->Destination)->Evaluate(this->Makefile, config);
}
//
@@ -551,7 +550,7 @@ cmInstallTargetGenerator
}
// Fix the install_name settings in installed binaries.
- std::string installNameTool = this->Target->Target->GetMakefile()
+ std::string installNameTool = this->Makefile
->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL");
if(installNameTool.empty())
@@ -665,8 +664,7 @@ cmInstallTargetGenerator
return;
}
// Skip if on Apple
- if(this->Target->Target->GetMakefile()
- ->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
+ if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
return;
}
@@ -711,7 +709,7 @@ cmInstallTargetGenerator
return;
}
- cmMakefile* mf = this->Target->Target->GetMakefile();
+ cmMakefile* mf = this->Makefile;
if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
@@ -823,20 +821,20 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
}
// Don't handle OSX Bundles.
- if(this->Target->Target->GetMakefile()->IsOn("APPLE") &&
+ if(this->Makefile->IsOn("APPLE") &&
this->Target->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
{
return;
}
- if(! this->Target->Target->GetMakefile()->IsSet("CMAKE_STRIP"))
+ if(! this->Makefile->IsSet("CMAKE_STRIP"))
{
return;
}
os << indent << "if(CMAKE_INSTALL_DO_STRIP)\n";
os << indent << " execute_process(COMMAND \""
- << this->Target->Target->GetMakefile()->GetDefinition("CMAKE_STRIP")
+ << this->Makefile->GetDefinition("CMAKE_STRIP")
<< "\" \"" << toDestDirPath << "\")\n";
os << indent << "endif()\n";
}
@@ -855,13 +853,13 @@ cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
// Perform post-installation processing on the file depending
// on its type.
- if(!this->Target->Target->GetMakefile
[Cmake-commits] CMake branch, next, updated. v3.3.2-3203-g95c3902
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 95c39028ede8b8ba988f6d0f6964b0f7ce2bf76b (commit)
via 49f11b9e51506c26a019685c153ee54dee3a0c0e (commit)
via f135fafd934a5e12507c8c97cfc7c0fce990fd0d (commit)
via 9a97251d3771512962d21c4237b5c3d56b232e5b (commit)
via e652087a0118d580cb45df4a34bffb79e537c13a (commit)
via 10a06618949302bba33e04347b2d072d804dbeaf (commit)
from eb99bf2d6861ba6cfc282265a5947453032c68dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95c39028ede8b8ba988f6d0f6964b0f7ce2bf76b
commit 95c39028ede8b8ba988f6d0f6964b0f7ce2bf76b
Merge: eb99bf2 49f11b9
Author: Rolf Eike Beer
AuthorDate: Tue Sep 22 11:58:52 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 11:58:52 2015 -0400
Merge topic 'Threads-CXX' into next
49f11b9e FindThreads: officially announce it works with only C++ enabled
f135fafd FindThreads: fix printing a pointer value in test code
9a97251d FindThreads: make the call to try_run() work also if only C++ is
enabled
e652087a FindThreads: replace CheckIncludeFiles by CheckIncludeFile
10a06618 Check(Function|Library|Symbol)Exists: make it work if only C++ is
enabled
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49f11b9e51506c26a019685c153ee54dee3a0c0e
commit 49f11b9e51506c26a019685c153ee54dee3a0c0e
Author: Rolf Eike Beer
AuthorDate: Tue Sep 22 17:50:59 2015 +0200
Commit: Rolf Eike Beer
CommitDate: Tue Sep 22 17:55:33 2015 +0200
FindThreads: officially announce it works with only C++ enabled
diff --git a/Help/release/dev/Threads-CXX.rst b/Help/release/dev/Threads-CXX.rst
index 0f40ae9..2e34a01 100644
--- a/Help/release/dev/Threads-CXX.rst
+++ b/Help/release/dev/Threads-CXX.rst
@@ -1,6 +1,6 @@
Threads-CXX
-* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`, and
- :module:`CheckSymbolExists` modules learned to work in environments where
- only CXX is enabled.
+* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
+ :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
+ work in environments where only CXX is enabled.
diff --git a/Tests/FindThreads/CMakeLists.txt b/Tests/FindThreads/CMakeLists.txt
index 36518a3..aa9499b 100644
--- a/Tests/FindThreads/CMakeLists.txt
+++ b/Tests/FindThreads/CMakeLists.txt
@@ -1,9 +1,11 @@
-add_test(NAME FindThreads.C-only COMMAND ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/FindThreads/C-only"
- "${CMake_BINARY_DIR}/Tests/FindThreads/C-only"
- ${build_generator_args}
- --build-project FindThreads_C-only
- --build-options ${build_options}
- --test-command ${CMAKE_CTEST_COMMAND} -V
- )
+foreach (_lang IN ITEMS C CXX)
+ add_test(NAME FindThreads.${_lang}-only COMMAND ${CMAKE_CTEST_COMMAND}
+--build-and-test
+"${CMake_SOURCE_DIR}/Tests/FindThreads/${_lang}-only"
+"${CMake_BINARY_DIR}/Tests/FindThreads/${_lang}-only"
+${build_generator_args}
+--build-project FindThreads_${_lang}-only
+--build-options ${build_options}
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endforeach ()
diff --git a/Tests/FindThreads/CXX-only/CMakeLists.txt
b/Tests/FindThreads/CXX-only/CMakeLists.txt
new file mode 100644
index 000..9993123
--- /dev/null
+++ b/Tests/FindThreads/CXX-only/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+project(FindThreads_CXX-only CXX)
+
+set(CMAKE_THREAD_PREFER_PTHREAD On)
+find_package(Threads REQUIRED)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/CheckForPthreads.c
+ ${CMAKE_CURRENT_BINARY_DIR}/CheckForPthreads.cxx)
+
+if (NOT WIN32)
+ add_executable(thr ${CMAKE_CURRENT_BINARY_DIR}/CheckForPthreads.cxx)
+ target_link_libraries(thr Threads::Threads)
+endif ()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f135fafd934a5e12507c8c97cfc7c0fce990fd0d
commit f135fafd934a5e12507c8c97cfc7c0fce990fd0d
Author: Rolf Eike Beer
AuthorDate: Tue Sep 22 06:46:28 2015 +0200
Commit: Rolf Eike Beer
CommitDate: Tue Sep 22 17:55:33 2015 +0200
FindThreads: fix printing a pointer value in test code
This causes a warning in C mode, and entirely fails in C++ mode:
CMake/Modules/CheckForPthreads.c: In function ‘runner’:
CMake/Modules/CheckForPthreads.c:34:27: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
printf("%d CC: %d\n", (int)args, cc);
^
Use %p to print out a pointer value, which will not cause any problems.
While
at it, use std
[Cmake-commits] CMake branch, next, updated. v3.3.2-3197-geb99bf2
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 eb99bf2d6861ba6cfc282265a5947453032c68dc (commit)
via be4dc65ba74a26d742558a0e05e4748b18f4b4aa (commit)
from da0bdab6d9788728bf0671b22a287dd1b5517f42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb99bf2d6861ba6cfc282265a5947453032c68dc
commit eb99bf2d6861ba6cfc282265a5947453032c68dc
Merge: da0bdab be4dc65
Author: Domen Vrankar
AuthorDate: Tue Sep 22 11:39:06 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 11:39:06 2015 -0400
Merge topic 'cpack-package-empty-dirs-cleanup' into next
be4dc65b remove parts that were pushed by accident
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be4dc65ba74a26d742558a0e05e4748b18f4b4aa
commit be4dc65ba74a26d742558a0e05e4748b18f4b4aa
Author: Domen Vrankar
AuthorDate: Tue Sep 22 17:38:31 2015 +0200
Commit: Domen Vrankar
CommitDate: Tue Sep 22 17:38:31 2015 +0200
remove parts that were pushed by accident
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index aa4f181..04b1976 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -368,7 +368,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
"- Install directory: " << top << std::endl);
gl.RecurseOn();
gl.SetRecurseListDirs(true);
-// gl.SetRecurseThroughSymlinks(false);
if ( !gl.FindFiles(findExpr) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
diff --git a/Tests/RunCMake/CPack/CMakeLists.txt
b/Tests/RunCMake/CPack/CMakeLists.txt
index 449172a..46f1367 100644
--- a/Tests/RunCMake/CPack/CMakeLists.txt
+++ b/Tests/RunCMake/CPack/CMakeLists.txt
@@ -8,5 +8,5 @@ if(EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/${GENERATOR_TYPE}/${RunCMake_TEST}-specif
include("${GENERATOR_TYPE}/${RunCMake_TEST}-specifics.cmake")
endif()
-set(CPACK_GENERATOR "${GENERATOR_TYPE};TGZ")
+set(CPACK_GENERATOR "${GENERATOR_TYPE}")
include(CPack)
---
Summary of changes:
Source/CPack/cmCPackGenerator.cxx |1 -
Tests/RunCMake/CPack/CMakeLists.txt |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.2-3195-gda0bdab
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 da0bdab6d9788728bf0671b22a287dd1b5517f42 (commit)
via 40c7b4612341e4230516ef32a97449051379790a (commit)
via 03bfe71ae055ed9e5dbeb619967ee44e5f555459 (commit)
from 84ae6a68a62b3739015dba75a785ae6b939a882a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0bdab6d9788728bf0671b22a287dd1b5517f42
commit da0bdab6d9788728bf0671b22a287dd1b5517f42
Merge: 84ae6a6 40c7b46
Author: Brad King
AuthorDate: Tue Sep 22 11:24:25 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 11:24:25 2015 -0400
Merge topic 'vs-target-ordering' into next
40c7b461 VS: Fix rebuild with regeneration after input CMake code change
(#15754)
03bfe71a VS: Refactor target ordering logic
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40c7b4612341e4230516ef32a97449051379790a
commit 40c7b4612341e4230516ef32a97449051379790a
Author: Brad King
AuthorDate: Tue Sep 22 10:20:44 2015 -0400
Commit: Brad King
CommitDate: Tue Sep 22 10:26:00 2015 -0400
VS: Fix rebuild with regeneration after input CMake code change (#15754)
When using "cmake --build ." or "MSBuild ALL_BUILD.vcxproj" to drive the
build the dependencies in the .sln file are not considered. This means
that ProjectReference elements in .vcxproj files are used to order
targets. We must ensure that the ZERO_CHECK target is listed as the
first dependency of every target so that when it causes regeneration of
the build files then MSBuild has not yet loaded the updated files.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index b91ae11..92403e3 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2849,7 +2849,7 @@ void
cmVisualStudio10TargetGenerator::WriteProjectReferences()
= this->GlobalGenerator->GetTargetDirectDepends(this->GeneratorTarget);
typedef cmGlobalVisualStudioGenerator::OrderedTargetDependSet
OrderedTargetDependSet;
- OrderedTargetDependSet depends(unordered, std::string());
+ OrderedTargetDependSet depends(unordered, CMAKE_CHECK_BUILD_SYSTEM_TARGET);
this->WriteString("\n", 1);
for( OrderedTargetDependSet::const_iterator i = depends.begin();
i != depends.end(); ++i)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03bfe71ae055ed9e5dbeb619967ee44e5f555459
commit 03bfe71ae055ed9e5dbeb619967ee44e5f555459
Author: Brad King
AuthorDate: Tue Sep 22 10:14:49 2015 -0400
Commit: Brad King
CommitDate: Tue Sep 22 10:25:58 2015 -0400
VS: Refactor target ordering logic
Refactor cmGlobalVisualStudioGenerator::TargetCompare to store the name of
the target that should come first instead of hard-coding "ALL_BUILD".
Update client sites to specify "ALL_BUILD" when ordering for .sln files
and an empty string otherwise (in cases when "ALL_BUILD" should not be
encountered anyway).
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx
b/Source/cmGlobalVisualStudio6Generator.cxx
index df49948..14de698 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -217,7 +217,7 @@ void cmGlobalVisualStudio6Generator
TargetDependSet projectTargets;
TargetDependSet originalTargets;
this->GetTargetSets(projectTargets, originalTargets, root, generators);
- OrderedTargetDependSet orderedProjectTargets(projectTargets);
+ OrderedTargetDependSet orderedProjectTargets(projectTargets, "ALL_BUILD");
for(OrderedTargetDependSet::const_iterator
tt = orderedProjectTargets.begin();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx
b/Source/cmGlobalVisualStudio71Generator.cxx
index 607642c..b913afc 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -94,7 +94,7 @@ void cmGlobalVisualStudio71Generator
TargetDependSet projectTargets;
TargetDependSet originalTargets;
this->GetTargetSets(projectTargets, originalTargets, root, generators);
- OrderedTargetDependSet orderedProjectTargets(projectTargets);
+ OrderedTargetDependSet orderedProjectTargets(projectTargets, "ALL_BUILD");
this->WriteTargetsToSolution(fout, root, orderedProjectTargets);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index 0175062..05da022 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -568,7 +568,7 @@ void cmGlobalVisualStudio7Generator
TargetDependSet projectTar
[Cmake-commits] CMake branch, next, updated. v3.3.2-3192-g84ae6a6
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 84ae6a68a62b3739015dba75a785ae6b939a882a (commit) via 442d17ef6c50a3ffc83ed6a860dc05febd85f1b4 (commit) via fcd9f85660bb0de569a5a5770b98eb7d922fbd6b (commit) via da7c8a8dae10a4fd2f33798bc8aec8a3c238b2af (commit) via 4be709a6b715acb4100fceb4394ad5215d8b555b (commit) via f1365f32064d6e56c1cbdf27bb18b9c7a8490330 (commit) via dce7d8befb94e2531d6c7d68b78b4b4a67ca024f (commit) from 096946bd49b2342a347c700947b5fdf930f6cc08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84ae6a68a62b3739015dba75a785ae6b939a882a commit 84ae6a68a62b3739015dba75a785ae6b939a882a Merge: 096946b 442d17e Author: Brad King AuthorDate: Tue Sep 22 10:47:24 2015 -0400 Commit: Brad King CommitDate: Tue Sep 22 10:47:24 2015 -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.3.2-1260-g442d17e
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 442d17ef6c50a3ffc83ed6a860dc05febd85f1b4 (commit)
via b58de9fe2ba4ac3e194403ecd118fd54681ffae8 (commit)
via 47b060aee0871bdb5fea63b398a1f1cb07fa3b37 (commit)
from fcd9f85660bb0de569a5a5770b98eb7d922fbd6b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=442d17ef6c50a3ffc83ed6a860dc05febd85f1b4
commit 442d17ef6c50a3ffc83ed6a860dc05febd85f1b4
Merge: fcd9f85 b58de9f
Author: Brad King
AuthorDate: Tue Sep 22 10:47:11 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 10:47:11 2015 -0400
Merge topic 'cpack-package-empty-dirs'
b58de9fe CPack: allow packaging of empty directories
47b060ae CPackDeb: allow empty directories in component packages
---
Summary of changes:
Help/release/dev/cpack-package-empty-dirs.rts |4
Source/CPack/cmCPackDebGenerator.cxx |2 ++
Source/CPack/cmCPackGenerator.cxx |5 +
Source/cmSystemTools.cxx | 21
Tests/CPackComponentsDEB/CMakeLists.txt|3 +--
Tests/RunCMake/CPack/CMakeLists.txt|2 +-
Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake|5 +
.../DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake |5 +
.../CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake |2 ++
.../CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake|5 +
...L-specifics.cmake => EMPTY_DIR-specifics.cmake} |0
Tests/RunCMake/CPack/EMPTY_DIR.cmake |4
.../RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake |5 +
.../CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt |1 +
.../CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake|5 +
Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt |1 +
Tests/RunCMake/CPack/RunCMakeTest.cmake|2 ++
17 files changed, 69 insertions(+), 3 deletions(-)
create mode 100644 Help/release/dev/cpack-package-empty-dirs.rts
create mode 100644 Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
create mode 100644
Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
create mode 100644
Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake
create mode 100644 Tests/RunCMake/CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake
copy Tests/RunCMake/CPack/DEB/{MINIMAL-specifics.cmake =>
EMPTY_DIR-specifics.cmake} (100%)
create mode 100644 Tests/RunCMake/CPack/EMPTY_DIR.cmake
create mode 100644
Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt
create mode 100644 Tests/RunCMake/CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt
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.3.2-1257-gfcd9f85
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 fcd9f85660bb0de569a5a5770b98eb7d922fbd6b (commit) via 4da5a22774f3c6b94743951acda3c56b433f0498 (commit) via 70c0cc72f085b4252e8b3578cdf1624b36c4e2c8 (commit) via 71c67e83bfe65f449b69b610b5be71164e5eee64 (commit) via 936a95d4059ce3c57b79a1bf28dd4f2bdf26ba29 (commit) from da7c8a8dae10a4fd2f33798bc8aec8a3c238b2af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcd9f85660bb0de569a5a5770b98eb7d922fbd6b commit fcd9f85660bb0de569a5a5770b98eb7d922fbd6b Merge: da7c8a8 4da5a22 Author: Brad King AuthorDate: Tue Sep 22 10:47:05 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 22 10:47:05 2015 -0400 Merge topic 'ctest-variable-docs' 4da5a227 Help: document CTEST_CUSTOM_* variables 70c0cc72 ctest_read_custom_files: mention that ctest does this automatically 71c67e83 CTEST_CUSTOM_*: treat variables as lists 936a95d4 CTestCoverageCollectGCOV: replace tabulators --- Summary of changes: CTestCustom.cmake.in | 16 +--- Help/command/ctest_read_custom_files.rst |3 +++ Help/manual/cmake-variables.7.rst | 16 Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst|7 +++ Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst |7 +++ Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst |7 +++ Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst |7 +++ Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst |7 +++ .../CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst |8 +--- .../variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst |8 .../CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst|8 .../CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE.rst |8 +--- Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst |7 +++ Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst |6 ++ Help/variable/CTEST_CUSTOM_POST_TEST.rst |6 ++ Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst|7 +++ Help/variable/CTEST_CUSTOM_PRE_TEST.rst|6 ++ Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst |7 +++ Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst |7 +++ Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst |7 +++ Help/variable/CTEST_CUSTOM_XXX.txt |2 ++ Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst|7 +++ Modules/CTestCoverageCollectGCOV.cmake |2 +- Tests/CTestCoverageCollectGCOV/test.cmake.in |6 +++--- 24 files changed, 151 insertions(+), 21 deletions(-) create mode 100644 Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst create mode 100644 Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst create mode 100644 Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst create mode 100644 Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst create mode 100644 Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst create mode 100644 Help/variable/CTEST_CUSTOM_POST_TEST.rst create mode 100644 Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst create mode 100644 Help/variable/CTEST_CUSTOM_PRE_TEST.rst create mode 100644 Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst create mode 100644 Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst create mode 100644 Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst create mode 100644 Help/variable/CTEST_CUSTOM_XXX.txt create mode 100644 Help/variable/CTEST_EXTRA_COVERAGE_GLOB.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.3.2-1252-gda7c8a8
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 da7c8a8dae10a4fd2f33798bc8aec8a3c238b2af (commit)
via b15f4e9b86bc3dc31b6a01c0ffc30747f467ec1f (commit)
via 9784af1b50a142c0160058734c7e12cee5f2a15e (commit)
from 4be709a6b715acb4100fceb4394ad5215d8b555b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da7c8a8dae10a4fd2f33798bc8aec8a3c238b2af
commit da7c8a8dae10a4fd2f33798bc8aec8a3c238b2af
Merge: 4be709a b15f4e9
Author: Brad King
AuthorDate: Tue Sep 22 10:46:59 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 22 10:46:59 2015 -0400
Merge topic 'restrict-shlib-link-flags-to-enable-exports'
b15f4e9b try_compile: Propogate CMP0065 to the generated project.
9784af1b CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK__FLAGS
---
Summary of changes:
Help/command/try_compile.rst |3 ++
Help/manual/cmake-policies.7.rst |1 +
Help/manual/cmake-variables.7.rst |1 +
Help/policy/CMP0065.rst| 27
Help/prop_tgt/ENABLE_EXPORTS.rst |5 ++-
...restrict-shlib-link-flags-to-enable-exports.rst |6 +++
.../CMAKE_ENABLE_EXPORTS.rst} |9 ++--
Help/variable/CMAKE_POLICY_WARNING_CMP.rst |2 +
Source/cmCoreTryCompile.cxx| 10 +
Source/cmLocalGenerator.cxx| 44 +---
Source/cmPolicies.h|4 ++
Source/cmTarget.cxx|1 +
Source/cmTarget.h |3 +-
.../RunCMake/CMP0065/BuildTargetInSubProject.cmake | 15 +++
.../{BuildDepends => CMP0065}/CMakeLists.txt |0
Tests/RunCMake/CMP0065/NEWBad.cmake|4 ++
Tests/RunCMake/CMP0065/NEWGood.cmake |4 ++
Tests/RunCMake/CMP0065/OLDBad1.cmake |4 ++
Tests/RunCMake/CMP0065/OLDBad2.cmake |4 ++
Tests/RunCMake/CMP0065/RunCMakeTest.cmake |8
Tests/RunCMake/CMP0065/WARN-OFF.cmake |3 ++
Tests/RunCMake/CMP0065/WARN-ON-stderr.txt | 10 +
Tests/RunCMake/CMP0065/WARN-ON.cmake |3 ++
Tests/RunCMake/CMP0065/subproject/CMakeLists.txt | 22 ++
.../main.cpp => CMP0065/subproject/main.c} |2 +
Tests/RunCMake/CMakeLists.txt |7
.../RunCMake/TargetPolicies/PolicyList-stderr.txt |1 +
27 files changed, 193 insertions(+), 10 deletions(-)
create mode 100644 Help/policy/CMP0065.rst
create mode 100644
Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
copy Help/{prop_tgt/ENABLE_EXPORTS.rst => variable/CMAKE_ENABLE_EXPORTS.rst}
(79%)
create mode 100644 Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
copy Tests/RunCMake/{BuildDepends => CMP0065}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/CMP0065/NEWBad.cmake
create mode 100644 Tests/RunCMake/CMP0065/NEWGood.cmake
create mode 100644 Tests/RunCMake/CMP0065/OLDBad1.cmake
create mode 100644 Tests/RunCMake/CMP0065/OLDBad2.cmake
create mode 100644 Tests/RunCMake/CMP0065/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/CMP0065/WARN-OFF.cmake
create mode 100644 Tests/RunCMake/CMP0065/WARN-ON-stderr.txt
create mode 100644 Tests/RunCMake/CMP0065/WARN-ON.cmake
create mode 100644 Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
copy Tests/RunCMake/{CompatibleInterface/main.cpp =>
CMP0065/subproject/main.c} (51%)
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.3.2-1249-g4be709a
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 4be709a6b715acb4100fceb4394ad5215d8b555b (commit) via 402bf096ec4aac75af096c3708ce51efaf4589d0 (commit) from f1365f32064d6e56c1cbdf27bb18b9c7a8490330 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4be709a6b715acb4100fceb4394ad5215d8b555b commit 4be709a6b715acb4100fceb4394ad5215d8b555b Merge: f1365f3 402bf09 Author: Brad King AuthorDate: Tue Sep 22 10:46:57 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 22 10:46:57 2015 -0400 Merge topic 'fix-policy-CMP0064-version' 402bf096 CMP0064: Fix recorded version of introduction to be 3.4 --- Summary of changes: Source/cmPolicies.h|2 +- Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt | 10 ++ Tests/RunCMake/CMP0064/CMP0064-WARN.cmake |2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt 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.3.2-1247-gf1365f3
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 f1365f32064d6e56c1cbdf27bb18b9c7a8490330 (commit) via 17009189f8bbf264b386bb610deafdd0d8ce53c2 (commit) from dce7d8befb94e2531d6c7d68b78b4b4a67ca024f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1365f32064d6e56c1cbdf27bb18b9c7a8490330 commit f1365f32064d6e56c1cbdf27bb18b9c7a8490330 Merge: dce7d8b 1700918 Author: Brad King AuthorDate: Tue Sep 22 10:46:54 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 22 10:46:54 2015 -0400 Merge topic 'fix-windows-version-detection' 17009189 Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674) --- Summary of changes: Source/CMakeLists.txt | 12 Source/QtDialog/CMakeLists.txt |2 +- Source/cmake.version.manifest | 18 ++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 Source/cmake.version.manifest 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.3.2-3185-g096946b
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 096946bd49b2342a347c700947b5fdf930f6cc08 (commit) via 4da5a22774f3c6b94743951acda3c56b433f0498 (commit) from 58c40573e265ae38d64738cf4033373df0f2a6a5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=096946bd49b2342a347c700947b5fdf930f6cc08 commit 096946bd49b2342a347c700947b5fdf930f6cc08 Merge: 58c4057 4da5a22 Author: Brad King AuthorDate: Tue Sep 22 10:46:02 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 22 10:46:02 2015 -0400 Merge topic 'ctest-variable-docs' into next 4da5a227 Help: document CTEST_CUSTOM_* variables http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4da5a22774f3c6b94743951acda3c56b433f0498 commit 4da5a22774f3c6b94743951acda3c56b433f0498 Author: Ben Boeckel AuthorDate: Thu Sep 17 10:57:46 2015 -0400 Commit: Brad King CommitDate: Tue Sep 22 10:44:52 2015 -0400 Help: document CTEST_CUSTOM_* variables diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 660d544..991cd55 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -374,8 +374,23 @@ Variables for CTest /variable/CTEST_COVERAGE_COMMAND /variable/CTEST_COVERAGE_EXTRA_FLAGS /variable/CTEST_CURL_OPTIONS + /variable/CTEST_CUSTOM_COVERAGE_EXCLUDE + /variable/CTEST_CUSTOM_ERROR_EXCEPTION + /variable/CTEST_CUSTOM_ERROR_MATCH + /variable/CTEST_CUSTOM_ERROR_POST_CONTEXT + /variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT /variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE + /variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS + /variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS /variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE + /variable/CTEST_CUSTOM_MEMCHECK_IGNORE + /variable/CTEST_CUSTOM_POST_MEMCHECK + /variable/CTEST_CUSTOM_POST_TEST + /variable/CTEST_CUSTOM_PRE_MEMCHECK + /variable/CTEST_CUSTOM_PRE_TEST + /variable/CTEST_CUSTOM_TEST_IGNORE + /variable/CTEST_CUSTOM_WARNING_EXCEPTION + /variable/CTEST_CUSTOM_WARNING_MATCH /variable/CTEST_CVS_CHECKOUT /variable/CTEST_CVS_COMMAND /variable/CTEST_CVS_UPDATE_OPTIONS @@ -385,6 +400,7 @@ Variables for CTest /variable/CTEST_DROP_SITE_CDASH /variable/CTEST_DROP_SITE_PASSWORD /variable/CTEST_DROP_SITE_USER + /variable/CTEST_EXTRA_COVERAGE_GLOB /variable/CTEST_GIT_COMMAND /variable/CTEST_GIT_UPDATE_CUSTOM /variable/CTEST_GIT_UPDATE_OPTIONS diff --git a/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst b/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst new file mode 100644 index 000..d5893c9 --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst @@ -0,0 +1,7 @@ +CTEST_CUSTOM_COVERAGE_EXCLUDE +- + +A list of regular expressions which will be used to exclude files by their +path from coverage output by the :command:`ctest_coverage` command. + +.. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst b/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst new file mode 100644 index 000..cd65ae3 --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst @@ -0,0 +1,7 @@ +CTEST_CUSTOM_ERROR_EXCEPTION + + +A list of regular expressions which will be used to exclude when detecting +error messages in build outputs by the :command:`ctest_test` command. + +.. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst b/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst new file mode 100644 index 000..558f5e5 --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst @@ -0,0 +1,7 @@ +CTEST_CUSTOM_ERROR_MATCH + + +A list of regular expressions which will be used to detect error messages in +build outputs by the :command:`ctest_test` command. + +.. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst b/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst new file mode 100644 index 000..614859b --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst @@ -0,0 +1,7 @@ +CTEST_CUSTOM_ERROR_POST_CONTEXT +--- + +The number of lines to include as context which follow an error message by the +:command:`ctest_test` command. The default is 10. + +.. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst b/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst new file mode 100644 index 000..74dc47a --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst @@ -0,0 +1,7 @
