[Cmake-commits] CMake branch, master, updated. v3.7.1-892-g25d7b88
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 25d7b8836d8a073d13c384a14bae05d5c1d244eb (commit) from 59461c2696e46f5d3eaf5753ee4f7d2ee6eb71a6 (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=25d7b8836d8a073d13c384a14bae05d5c1d244eb commit 25d7b8836d8a073d13c384a14bae05d5c1d244eb Author: Kitware Robot AuthorDate: Fri Dec 16 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Fri Dec 16 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c41fe3a..ae9c31e 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161215) +set(CMake_VERSION_PATCH 20161216) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1788-g52a9fd5
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 52a9fd5a28163f02091b81d343ac897df5f6fc37 (commit) via 30ef584bd16398ed4736175c965872172107d92a (commit) from 048f528573587cb310456dc8b28833bc44cbe6d1 (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=52a9fd5a28163f02091b81d343ac897df5f6fc37 commit 52a9fd5a28163f02091b81d343ac897df5f6fc37 Merge: 048f528 30ef584 Author: Rolf Eike Beer AuthorDate: Thu Dec 15 16:55:58 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 16:55:58 2016 -0500 Merge topic 'gcc-34-features' into next 30ef584b record features of gcc 3.4..4.3 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30ef584bd16398ed4736175c965872172107d92a commit 30ef584bd16398ed4736175c965872172107d92a Author: Rolf Eike Beer AuthorDate: Thu Dec 15 22:54:41 2016 +0100 Commit: Rolf Eike Beer CommitDate: Thu Dec 15 22:54:41 2016 +0100 record features of gcc 3.4..4.3 This is not entirely complete, i.e. for some features the version they were introduced in is not set yet. This is just a first test to see what breaks. DO NOT MERGE YET. diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake index b3fe33f..0ab5265 100644 --- a/Modules/Compiler/GNU-C-FeatureTests.cmake +++ b/Modules/Compiler/GNU-C-FeatureTests.cmake @@ -1,5 +1,5 @@ -set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") +set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it # to 201000L. As the former is strictly greater than the latter, test only @@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests. set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L") set(_cmake_feature_test_c_static_assert "${GNU46_C11}") -# Since 4.4 at least: -set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") -set(_cmake_feature_test_c_restrict "${GNU44_C99}") -set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}") +# Since 3.4 at least: +set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") +set(_cmake_feature_test_c_restrict "${GNU34_C99}") +set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}") set(GNU_C90 "${_cmake_oldestSupported}") set(_cmake_feature_test_c_function_prototypes "${GNU_C90}") diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 05c3bb2..48442dd 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -9,7 +9,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99") set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99") endif() @@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) 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}") @@ -41,7 +41,7 @@ endif() macro(cmake_record_c_compile_features) set(_result 0) - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) + if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION) _record_compiler_features_c(11) endif() diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index d18adaf..003 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -2,7 +2,7 @@ # Reference: http://gcc.gnu.org/projects/cxx0x.html # http://gcc.gnu.org/projects/cxx1y.html -set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") +set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") set(GNU50_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 500 && __cplusplus >= 201402L") set(_cmake_feature_test_cxx_variable_templates
[Cmake-commits] CMake branch, next, updated. v3.7.1-1786-g048f528
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 048f528573587cb310456dc8b28833bc44cbe6d1 (commit) via 6271df8ff5ce5552929bb76440fa432641498800 (commit) from 0045e4ba1b8b8fe57651f1ce5411f2061d79bdd4 (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=048f528573587cb310456dc8b28833bc44cbe6d1 commit 048f528573587cb310456dc8b28833bc44cbe6d1 Merge: 0045e4b 6271df8 Author: Brad King AuthorDate: Thu Dec 15 16:28:09 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 16:28:09 2016 -0500 Merge topic 'refactor-compile-pdb-path' into next 6271df8f Makefile,Ninja: De-duplicate MSVC compiler PDB path selection https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6271df8ff5ce5552929bb76440fa432641498800 commit 6271df8ff5ce5552929bb76440fa432641498800 Author: Brad King AuthorDate: Thu Dec 15 16:15:28 2016 -0500 Commit: Brad King CommitDate: Thu Dec 15 16:20:21 2016 -0500 Makefile,Ninja: De-duplicate MSVC compiler PDB path selection Add a helper to cmCommonTargetGenerator instead of duplicating it in cmMakefileTargetGenerator and cmNinjaTargetGenerator. diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index c3a925f..7e113ab 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -184,6 +184,28 @@ std::vector cmCommonTargetGenerator::GetLinkedTargetDirectories() return dirs; } +std::string cmCommonTargetGenerator::ComputeTargetCompilePDB() const +{ + std::string compilePdbPath; + if (this->GeneratorTarget->GetType() > cmStateEnums::OBJECT_LIBRARY) { +return compilePdbPath; + } + compilePdbPath = +this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName()); + if (compilePdbPath.empty()) { +// Match VS default: `$(IntDir)vc$(PlatformToolsetVersion).pdb`. +// A trailing slash tells the toolchain to add its default file name. +compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/"; +if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY) { + // Match VS default for static libs: `$(IntDir)$(ProjectName).pdb`. + compilePdbPath += this->GeneratorTarget->GetName(); + compilePdbPath += ".pdb"; +} + } + + return compilePdbPath; +} + std::string cmCommonTargetGenerator::GetManifests() { std::vector manifest_srcs; diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h index bdd6645..d67fefb 100644 --- a/Source/cmCommonTargetGenerator.h +++ b/Source/cmCommonTargetGenerator.h @@ -66,6 +66,7 @@ protected: std::string GetManifests(); std::vector GetLinkedTargetDirectories() const; + std::string ComputeTargetCompilePDB() const; }; #endif diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 4218930..379ae16 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -504,7 +504,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile( { std::string targetFullPathReal; std::string targetFullPathPDB; -std::string targetFullPathCompilePDB; +std::string targetFullPathCompilePDB = this->ComputeTargetCompilePDB(); if (this->GeneratorTarget->GetType() == cmStateEnums::EXECUTABLE || this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY || this->GeneratorTarget->GetType() == cmStateEnums::SHARED_LIBRARY || @@ -516,21 +516,6 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile( targetFullPathPDB += "/"; targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName); } -if (this->GeneratorTarget->GetType() <= cmStateEnums::OBJECT_LIBRARY) { - targetFullPathCompilePDB = -this->GeneratorTarget->GetCompilePDBPath(this->ConfigName); - if (targetFullPathCompilePDB.empty()) { -// Match VS default: `$(IntDir)vc$(PlatformToolsetVersion).pdb`. -// A trailing slash tells the toolchain to add its default file name. -targetFullPathCompilePDB = - this->GeneratorTarget->GetSupportDirectory() + "/"; -if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY) { - // Match VS default for static libs: `$(IntDir)$(ProjectName).pdb`. - targetFullPathCompilePDB += this->GeneratorTarget->GetName(); - targetFullPathCompilePDB += ".pdb"; -} - } -} targetOutPathReal = this->LocalGenerator->ConvertToOutputFormat( this->LocalGenerator->MaybeConvertToRelativePath( diff --git a/Source/cmNinjaTargetGenerator.cxx b/
[Cmake-commits] CMake branch, next, updated. v3.7.1-1784-g0045e4b
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 0045e4ba1b8b8fe57651f1ce5411f2061d79bdd4 (commit) via c59811a233267a21fdea14af4bc6583af0f8d9b0 (commit) from a22263ea280290e0255b9b6e73dd0e9b45f799e4 (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=0045e4ba1b8b8fe57651f1ce5411f2061d79bdd4 commit 0045e4ba1b8b8fe57651f1ce5411f2061d79bdd4 Merge: a22263e c59811a Author: Brad King AuthorDate: Thu Dec 15 16:18:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 16:18:11 2016 -0500 Merge topic 'cuda_tests_now_explain_why_they_fail' into next c59811a2 CUDA: Tests now state why they are failing when no CUDA card is found. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c59811a233267a21fdea14af4bc6583af0f8d9b0 commit c59811a233267a21fdea14af4bc6583af0f8d9b0 Author: Robert Maynard AuthorDate: Thu Dec 15 15:57:01 2016 -0500 Commit: Robert Maynard CommitDate: Thu Dec 15 15:57:01 2016 -0500 CUDA: Tests now state why they are failing when no CUDA card is found. diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu index 9540e86..ea52acb 100644 --- a/Tests/Cuda/Complex/dynamic.cu +++ b/Tests/Cuda/Complex/dynamic.cu @@ -1,6 +1,7 @@ #include #include +#include int dynamic_base_func(int); @@ -15,15 +16,12 @@ void DetermineIfValidCudaDevice() { } -void cuda_dynamic_lib_func(std::string& contents ) +void cuda_dynamic_lib_func() { DetermineIfValidCudaDevice <<<1,1>>> (); - if(cudaSuccess == cudaGetLastError()) + cudaError_t err = cudaGetLastError(); + if(err == cudaSuccess) { -contents = "ran a cuda kernel"; -} - else -{ -contents = "cant run a cuda kernel"; +std::cerr << cudaGetErrorString(err) << std::endl; } } diff --git a/Tests/Cuda/Complex/file3.cu b/Tests/Cuda/Complex/file3.cu index 3c5e952..47e64c5 100644 --- a/Tests/Cuda/Complex/file3.cu +++ b/Tests/Cuda/Complex/file3.cu @@ -11,8 +11,6 @@ static __global__ void file3_kernel(result_type& r, int x) { - //call static_func which is a method that is defined in the - //static library that is always out of date r = file1_func(x); result_type_dynamic rd = file2_func(x); } @@ -21,5 +19,11 @@ int file3_launch_kernel(int x) { result_type r; file3_kernel <<<1,1>>> (r,x); + cudaError_t err = cudaGetLastError(); + if(err == cudaSuccess) +{ +std::cerr << cudaGetErrorString(err) << std::endl; +return x; +} return r.sum; } diff --git a/Tests/Cuda/Complex/mixed.cu b/Tests/Cuda/Complex/mixed.cu index d2e8275..45b412f 100644 --- a/Tests/Cuda/Complex/mixed.cu +++ b/Tests/Cuda/Complex/mixed.cu @@ -7,18 +7,20 @@ result_type __device__ file1_func(int x); result_type_dynamic __device__ file2_func(int x); +void __host__ cuda_dynamic_lib_func(); + static __global__ void mixed_kernel(result_type& r, int x) { - //call static_func which is a method that is defined in the - //static library that is always out of date r = file1_func(x); result_type_dynamic rd = file2_func(x); } int mixed_launch_kernel(int x) { + cuda_dynamic_lib_func(); + result_type r; mixed_kernel <<<1,1>>> (r,x); return r.sum; diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu index 6b02bbc..33a49d2 100644 --- a/Tests/CudaOnly/WithDefs/main.notcu +++ b/Tests/CudaOnly/WithDefs/main.notcu @@ -40,6 +40,7 @@ int main(int argc, char **argv) err = cudaGetDeviceCount(&nDevices); if(err != cudaSuccess) { + std::cerr << cudaGetErrorString(err) << std::endl; return 1; } return 0; --- Summary of changes: Tests/Cuda/Complex/dynamic.cu | 12 +--- Tests/Cuda/Complex/file3.cu|8 ++-- Tests/Cuda/Complex/mixed.cu|6 -- Tests/CudaOnly/WithDefs/main.notcu |1 + 4 files changed, 16 insertions(+), 11 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.7.1-1782-ga22263e
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 a22263ea280290e0255b9b6e73dd0e9b45f799e4 (commit) via 40e5614923db52a31b5e46a3bbc5e70105fcbf5a (commit) from 378ac83b75d0e4b00eaf7e792cba01b2836aa33d (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=a22263ea280290e0255b9b6e73dd0e9b45f799e4 commit a22263ea280290e0255b9b6e73dd0e9b45f799e4 Merge: 378ac83 40e5614 Author: Brad King AuthorDate: Thu Dec 15 16:12:42 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 16:12:42 2016 -0500 Merge topic 'copyright-year' into next 40e56149 Copyright.txt: Update year range to end in 2017 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40e5614923db52a31b5e46a3bbc5e70105fcbf5a commit 40e5614923db52a31b5e46a3bbc5e70105fcbf5a Author: Brad King AuthorDate: Thu Dec 15 15:51:59 2016 -0500 Commit: Brad King CommitDate: Thu Dec 15 15:51:59 2016 -0500 Copyright.txt: Update year range to end in 2017 diff --git a/Copyright.txt b/Copyright.txt index 63d7bb8..aa91102 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -1,5 +1,5 @@ CMake - Cross Platform Makefile Generator -Copyright 2000-2016 Kitware, Inc. and Contributors +Copyright 2000-2017 Kitware, Inc. and Contributors All rights reserved. Redistribution and use in source and binary forms, with or without --- Summary of changes: Copyright.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1780-g378ac83
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 378ac83b75d0e4b00eaf7e792cba01b2836aa33d (commit) via caeb6d1dfb7ec9ab471d24e71244d7899f044c27 (commit) from 211b66d781ba2ebb690d4f24fd4d5327fd720ef5 (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=378ac83b75d0e4b00eaf7e792cba01b2836aa33d commit 378ac83b75d0e4b00eaf7e792cba01b2836aa33d Merge: 211b66d caeb6d1 Author: Brad King AuthorDate: Thu Dec 15 09:59:38 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:59:38 2016 -0500 Merge topic 'FindGit-fix-cross-compile' into next caeb6d1d FindGit: Fix check for Windows host https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=caeb6d1dfb7ec9ab471d24e71244d7899f044c27 commit caeb6d1dfb7ec9ab471d24e71244d7899f044c27 Author: José Simões AuthorDate: Thu Dec 15 09:31:08 2016 -0500 Commit: Brad King CommitDate: Thu Dec 15 09:57:30 2016 -0500 FindGit: Fix check for Windows host When cross-compiling to or from a Windows platform we should still find a Git for the host environment. diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake index 769c6c3..b830c08 100644 --- a/Modules/FindGit.cmake +++ b/Modules/FindGit.cmake @@ -30,7 +30,7 @@ set(git_names git eg) # Prefer .cmd variants on Windows unless running in a Makefile # in the MSYS shell. # -if(WIN32) +if(CMAKE_HOST_WIN32) if(NOT CMAKE_GENERATOR MATCHES "MSYS") set(git_names git.cmd git eg.cmd eg) # GitHub search path for Windows --- Summary of changes: Modules/FindGit.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1778-g211b66d
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 211b66d781ba2ebb690d4f24fd4d5327fd720ef5 (commit) via 59461c2696e46f5d3eaf5753ee4f7d2ee6eb71a6 (commit) from e58beda22fce3afeea59b5e4c01f4fb039794dfc (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=211b66d781ba2ebb690d4f24fd4d5327fd720ef5 commit 211b66d781ba2ebb690d4f24fd4d5327fd720ef5 Merge: e58beda 59461c2 Author: Brad King AuthorDate: Thu Dec 15 09:43:03 2016 -0500 Commit: Brad King CommitDate: Thu Dec 15 09:43:03 2016 -0500 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.7.1-891-g59461c2
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 59461c2696e46f5d3eaf5753ee4f7d2ee6eb71a6 (commit) via 9fdad82c48fe28af73e07c2f91749c50fa5a131f (commit) from 94c6040b730e5b77e72c39dda10a0df3228ce279 (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=59461c2696e46f5d3eaf5753ee4f7d2ee6eb71a6 commit 59461c2696e46f5d3eaf5753ee4f7d2ee6eb71a6 Merge: 94c6040 9fdad82 Author: Brad King AuthorDate: Thu Dec 15 09:42:48 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:42:48 2016 -0500 Merge topic 'FindPNG-typo' 9fdad82c FindPNG: Fix small typo fix in module help --- Summary of changes: Modules/FindPNG.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1776-ge58beda
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 e58beda22fce3afeea59b5e4c01f4fb039794dfc (commit) via 9fdad82c48fe28af73e07c2f91749c50fa5a131f (commit) from ba41887aaf0d36f696c67b06ff9965b74728ff30 (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=e58beda22fce3afeea59b5e4c01f4fb039794dfc commit e58beda22fce3afeea59b5e4c01f4fb039794dfc Merge: ba41887 9fdad82 Author: Brad King AuthorDate: Thu Dec 15 09:39:21 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:39:21 2016 -0500 Merge topic 'FindPNG-typo' into next 9fdad82c FindPNG: Fix small typo fix in module help https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fdad82c48fe28af73e07c2f91749c50fa5a131f commit 9fdad82c48fe28af73e07c2f91749c50fa5a131f Author: Maxime Morel AuthorDate: Wed Dec 14 21:09:49 2016 + Commit: Brad King CommitDate: Thu Dec 15 09:38:51 2016 -0500 FindPNG: Fix small typo fix in module help diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 1d5d553..dceb6bc 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -25,7 +25,7 @@ # ``PNG_LIBRARIES`` # the libraries to link against to use PNG. # ``PNG_DEFINITIONS`` -# You should add_definitons(${PNG_DEFINITIONS}) before compiling code +# You should add_definitions(${PNG_DEFINITIONS}) before compiling code # that includes png library files. # ``PNG_FOUND`` # If false, do not try to use PNG. --- Summary of changes: Modules/FindPNG.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1774-gba41887
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 ba41887aaf0d36f696c67b06ff9965b74728ff30 (commit) via a12d8a03af8430d0a570c97deb200e16830568eb (commit) from da7df841c1bfd82d9b21592f708ce4a090cf7d75 (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=ba41887aaf0d36f696c67b06ff9965b74728ff30 commit ba41887aaf0d36f696c67b06ff9965b74728ff30 Merge: da7df84 a12d8a0 Author: Brad King AuthorDate: Thu Dec 15 09:35:51 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:35:51 2016 -0500 Merge topic 'FindPythonLibs-tolerate-components' into next a12d8a03 FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a list https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a12d8a03af8430d0a570c97deb200e16830568eb commit a12d8a03af8430d0a570c97deb200e16830568eb Author: Francois Budin AuthorDate: Tue Dec 13 22:29:46 2016 -0500 Commit: Brad King CommitDate: Thu Dec 15 09:34:48 2016 -0500 FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a list `PYTHON_LIBRARY` may contain a list because of `SelectLibraryConfigurations`. If it is the case, the list can be: optimized;;debug; Instead of directly using the value of `PYTHON_LIBRARY` in the CMake function `get_filename_component()`, we loop over the content of the relevant parts of `PYTHON_LIBRARY` and `PYTHON_DEBUG_LIBRARY` whether they are lists or not. Suggested-by: Brad King diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index cd623cf..63ec9a8 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -168,12 +168,19 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS}) # Use the library's install prefix as a hint set(_Python_INCLUDE_PATH_HINT) -get_filename_component(_Python_PREFIX ${PYTHON_LIBRARY} PATH) -get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH) -if(_Python_PREFIX) - set(_Python_INCLUDE_PATH_HINT ${_Python_PREFIX}/include) -endif() -unset(_Python_PREFIX) +# PYTHON_LIBRARY may contain a list because of SelectLibraryConfigurations +# which may have been run previously. If it is the case, the list can be: +# optimized;;debug; +foreach(lib ${PYTHON_LIBRARY} ${PYTHON_DEBUG_LIBRARY}) + if(IS_ABSOLUTE "${lib}") +get_filename_component(_Python_PREFIX "${lib}" PATH) +get_filename_component(_Python_PREFIX "${_Python_PREFIX}" PATH) +if(_Python_PREFIX) + list(APPEND _Python_INCLUDE_PATH_HINT ${_Python_PREFIX}/include) +endif() +unset(_Python_PREFIX) + endif() +endforeach() # Add framework directories to the search paths set(PYTHON_FRAMEWORK_INCLUDES) --- Summary of changes: Modules/FindPythonLibs.cmake | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1772-gda7df84
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 da7df841c1bfd82d9b21592f708ce4a090cf7d75 (commit) via 94c6040b730e5b77e72c39dda10a0df3228ce279 (commit) via a9fee0667ee6396a6a0b7e5d33b542e49e3054c9 (commit) via a20edeebd2c93ce1d1549d79b525ba5260d7faa5 (commit) via 517c7cca8c856546a93454cf0cf98fe6bad3f856 (commit) from 7b249311422b8d4c9edd76a12ba0e287b4cd245e (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=da7df841c1bfd82d9b21592f708ce4a090cf7d75 commit da7df841c1bfd82d9b21592f708ce4a090cf7d75 Merge: 7b24931 94c6040 Author: Brad King AuthorDate: Thu Dec 15 09:30:10 2016 -0500 Commit: Brad King CommitDate: Thu Dec 15 09:30:10 2016 -0500 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.7.1-885-ga20edee
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 a20edeebd2c93ce1d1549d79b525ba5260d7faa5 (commit) via da03e2d6c60f70f6dfe581e130067b2dde4517fc (commit) via a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf (commit) via 2413075765228001a205017c670abbefdf3b7f61 (commit) from 517c7cca8c856546a93454cf0cf98fe6bad3f856 (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=a20edeebd2c93ce1d1549d79b525ba5260d7faa5 commit a20edeebd2c93ce1d1549d79b525ba5260d7faa5 Merge: 517c7cc da03e2d Author: Brad King AuthorDate: Thu Dec 15 09:29:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:29:53 2016 -0500 Merge topic 'update-kwsys' da03e2d6 Merge branch 'upstream-KWSys' into update-kwsys a9ea66bd KWSys 2016-12-14 (95a7e234) 24130757 update-kwsys: Update repository URL --- Summary of changes: Source/kwsys/.gitattributes |4 ++-- Source/kwsys/CONTRIBUTING.rst | 29 +-- Source/kwsys/README.rst | 37 +++ Source/kwsys/README.txt | 12 Utilities/Scripts/update-kwsys.bash |2 +- 5 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 Source/kwsys/README.rst delete mode 100644 Source/kwsys/README.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.7.1-887-ga9fee06
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 a9fee0667ee6396a6a0b7e5d33b542e49e3054c9 (commit) via 58f02aaa4df6dcdac917ff7af7db2a7a1eb040f9 (commit) from a20edeebd2c93ce1d1549d79b525ba5260d7faa5 (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=a9fee0667ee6396a6a0b7e5d33b542e49e3054c9 commit a9fee0667ee6396a6a0b7e5d33b542e49e3054c9 Merge: a20edee 58f02aa Author: Brad King AuthorDate: Thu Dec 15 09:29:56 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:29:56 2016 -0500 Merge topic 'doc-clarify-CMAKE_CL_64' 58f02aaa Help: Clarify meaning of CMAKE_CL_64 --- Summary of changes: Help/variable/CMAKE_CL_64.rst |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-889-g94c6040
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 94c6040b730e5b77e72c39dda10a0df3228ce279 (commit) via f17394185558d6adc4e09c19937c798580fbf1f3 (commit) from a9fee0667ee6396a6a0b7e5d33b542e49e3054c9 (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=94c6040b730e5b77e72c39dda10a0df3228ce279 commit 94c6040b730e5b77e72c39dda10a0df3228ce279 Merge: a9fee06 f173941 Author: Brad King AuthorDate: Thu Dec 15 09:29:59 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:29:59 2016 -0500 Merge topic 'codelite-build-and-clean-targets-enhancement' f1739418 CodeLite: Make build/clean/rebuild operations optionally target-centric --- Summary of changes: ...odelite-build-and-clean-targets-enhancement.rst | 10 Source/cmExtraCodeLiteGenerator.cxx| 59 +--- Source/cmExtraCodeLiteGenerator.h | 12 ++-- 3 files changed, 56 insertions(+), 25 deletions(-) create mode 100644 Help/release/dev/codelite-build-and-clean-targets-enhancement.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, next, updated. v3.7.1-1767-g7b24931
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 7b249311422b8d4c9edd76a12ba0e287b4cd245e (commit) via 5c6c0344d32f9282059d46b6fe6f9925ac1f1202 (commit) from 6df91bf6f7f3d9cce662606889585ad41eb85cba (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=7b249311422b8d4c9edd76a12ba0e287b4cd245e commit 7b249311422b8d4c9edd76a12ba0e287b4cd245e Merge: 6df91bf 5c6c034 Author: Brad King AuthorDate: Thu Dec 15 09:16:52 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:16:52 2016 -0500 Merge topic 'csharp_support_compiler_detection' into next 5c6c0344 C# support: add compiler detection for MSVC https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c6c0344d32f9282059d46b6fe6f9925ac1f1202 commit 5c6c0344d32f9282059d46b6fe6f9925ac1f1202 Author: Michael Stürmer AuthorDate: Mon Dec 12 14:52:29 2016 +0100 Commit: Brad King CommitDate: Thu Dec 15 09:16:30 2016 -0500 C# support: add compiler detection for MSVC diff --git a/Modules/CMakeCSharpCompiler.cmake.in b/Modules/CMakeCSharpCompiler.cmake.in new file mode 100644 index 000..5ecc480 --- /dev/null +++ b/Modules/CMakeCSharpCompiler.cmake.in @@ -0,0 +1,9 @@ +set(CMAKE_CSharp_COMPILER "@CMAKE_CSharp_COMPILER@") +set(CMAKE_CSharp_COMPILER_ID "@CMAKE_CSharp_COMPILER_ID@") +set(CMAKE_CSharp_COMPILER_VERSION "@CMAKE_CSharp_COMPILER_VERSION@") + +set(CMAKE_CSharp_COMPILER_WORKS "@CMAKE_CSharp_COMPILER_WORKS@") + +set(CMAKE_CSharp_COMPILER_ID_RUN "@CMAKE_CSharp_COMPILER_ID_RUN@") +set(CMAKE_CSharp_IGNORE_EXTENSIONS "inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC") +set(CMAKE_CSharp_SOURCE_FILE_EXTENSIONS "cs") diff --git a/Modules/CMakeCSharpCompilerId.cs.in b/Modules/CMakeCSharpCompilerId.cs.in new file mode 100644 index 000..987f63a --- /dev/null +++ b/Modules/CMakeCSharpCompilerId.cs.in @@ -0,0 +1,63 @@ +using System; + +namespace CSharp +{ +public class CSharpApp +{ +const string InfoCompiler = "INFO:compiler[Microsoft " +#if PlatformToolsetv100 ++ "Visual Studio" +#elif PlatformToolsetv110 ++ "Visual Studio" +#elif PlatformToolsetv120 ++ "Visual Studio" +#elif PlatformToolsetv140 ++ "Visual Studio" +#elif PlatformToolsetv141 ++ "Visual Studio" +#else ++ "unknown" +#endif ++ "]"; + +const string InfoPlatform = "INFO:platform[Windows]"; + +const string InfoArchitecture = "INFO:arch[" +#if Platformx64 ++ "x64" +#elif Platformx86 ++ "x86" +#elif PlatformxWin32 ++ "Win32]" +#else ++ "unknown" +#endif ++ "]"; + +const string InfoCompilerVersion = "INFO:compiler_version[" +#if PlatformToolsetv100 ++ "2010" +#elif PlatformToolsetv110 ++ "2012" +#elif PlatformToolsetv120 ++ "2013" +#elif PlatformToolsetv140 ++ "2015" +#elif PlatformToolsetv141 ++ "2017" +#else ++ "" +#endif ++ "]"; + +static void Main(string[] args) +{ +// we have to print the lines to make sure +// the compiler does not optimize them away ... +System.Console.WriteLine(InfoCompiler); +System.Console.WriteLine(InfoPlatform); +System.Console.WriteLine(InfoArchitecture); +System.Console.WriteLine(InfoCompilerVersion); +} +} +} diff --git a/Modules/CMakeCSharpInformation.cmake b/Modules/CMakeCSharpInformation.cmake new file mode 100644 index 000..dc775bd --- /dev/null +++ b/Modules/CMakeCSharpInformation.cmake @@ -0,0 +1,119 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +# This file sets the basic flags for the C# language in CMake. +# It also loads the available platform file for the system-compiler +# if it exists. + +set(CMAKE_BASE_NAME) +get_filename_component(CMAKE_BASE_NAME "${CMAKE_CSharp_COMPILER}" NAME_WE) + +set(CMAKE_BUILD_TYPE_INIT Debug) + +set(CMAKE_CSharp_FLAGS_INIT "/define:TRACE /langversion:3 /nowin32manifest") +set(CMAKE_CSharp_FLAGS_DEBUG_INIT "/debug:full /optimize- /warn:3 /errorreport:prompt /define:DEBUG") +set(CMAKE_CSharp_FLAGS_RELEASE_INIT "/debug:none /optimize /warn:1 /errorreport:queue") +set(CMAKE_CSharp_FLAGS_RELWITHDEBINFO_INIT "/debug:full /optimize-") +set(CMAKE_CSharp_FLAGS_MINSIZEREL_INIT "/debug:none /optimize") +set(CMAKE_CSharp_LINKER_SUPPORTS_PDB ON) + +set(CMAKE_CSharp_STANDARD_LIBRARIES_INIT "System") + +if(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(CMAKE_CSharp_FLAGS_INIT "/platform:x86 ${CMAKE_CSharp_FLAGS_INIT}") +el
[Cmake-commits] CMake branch, next, updated. v3.7.1-1765-g6df91bf
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 6df91bf6f7f3d9cce662606889585ad41eb85cba (commit) via e5af11d4d1daa7079c2635700fbcd50f0cb3ac01 (commit) from 5d67e5457f9eac7cd1be20f11b4a2331d7b56337 (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=6df91bf6f7f3d9cce662606889585ad41eb85cba commit 6df91bf6f7f3d9cce662606889585ad41eb85cba Merge: 5d67e54 e5af11d Author: Brad King AuthorDate: Thu Dec 15 09:16:19 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 15 09:16:19 2016 -0500 Merge topic 'csharp_support_compiler_detection' into next e5af11d4 VS: fixing C# compiler detection. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5af11d4d1daa7079c2635700fbcd50f0cb3ac01 commit e5af11d4d1daa7079c2635700fbcd50f0cb3ac01 Author: Michael Stürmer AuthorDate: Thu Dec 15 09:38:20 2016 +0100 Commit: Brad King CommitDate: Thu Dec 15 09:16:02 2016 -0500 VS: fixing C# compiler detection. On some systems the Microsoft.Common.props file was not found, so it was removed from the VS-10.csproj.in diff --git a/Modules/CMakeDetermineCSharpCompiler.cmake b/Modules/CMakeDetermineCSharpCompiler.cmake index fbe2f38..1b8dd02 100644 --- a/Modules/CMakeDetermineCSharpCompiler.cmake +++ b/Modules/CMakeDetermineCSharpCompiler.cmake @@ -23,8 +23,8 @@ if(NOT CMAKE_CSharp_COMPILER_ID_RUN) include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake) CMAKE_DETERMINE_COMPILER_ID(CSharp CSFLAGS CMakeCSharpCompilerId.cs) - execute_process(COMMAND ${CMAKE_CSharp_COMPILER} "/help" OUTPUT_VARIABLE output) - string(REPLACE "\n" ";" output ${output}) + execute_process(COMMAND "${CMAKE_CSharp_COMPILER}" "/help" OUTPUT_VARIABLE output) + string(REPLACE "\n" ";" output "${output}") foreach(line ${output}) string(TOUPPER ${line} line) string(REGEX REPLACE "^.*COMPILER.*VERSION[^\\.0-9]*([\\.0-9]+).*$" "\\1" version "${line}") diff --git a/Modules/CompilerId/VS-10.csproj.in b/Modules/CompilerId/VS-10.csproj.in index 7fea724..833dca7 100644 --- a/Modules/CompilerId/VS-10.csproj.in +++ b/Modules/CompilerId/VS-10.csproj.in @@ -1,11 +1,5 @@ http://schemas.microsoft.com/developer/msbuild/2003";> - - - Debug - @id_platform@ - - {CAE07175-D007-4FC3-BFE8-47B392814159} CompilerId@id_lang@ @@ -15,7 +9,6 @@ @id_WindowsTargetPlatformVersion@ @id_WindowsSDKDesktopARMSupport@ - @id_PreferredToolArchitecture@ @@ -54,8 +47,6 @@ - - cd /D "$(MSBuildToolsPath)" if not %errorlevel%==0 exit -1 if not exist @id_cl@ exit -2 --- Summary of changes: Modules/CMakeDetermineCSharpCompiler.cmake |4 ++-- Modules/CompilerId/VS-10.csproj.in |9 - 2 files changed, 2 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits