From kwrobot at kitware.com Tue Dec 1 00:01:11 2015 From: kwrobot at kitware.com (Kitware Robot) Date: Tue, 1 Dec 2015 00:01:11 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.0-625-ga6f5281 Message-ID: <20151201050111.75B0BD71FD@public.kitware.com> 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 a6f5281419c59b433f248b41972530242172a124 (commit) from 2218962dbdc7f552a076978a0393433091aa35c4 (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=a6f5281419c59b433f248b41972530242172a124 commit a6f5281419c59b433f248b41972530242172a124 Author: Kitware Robot AuthorDate: Tue Dec 1 00:01:08 2015 -0500 Commit: Kitware Robot CommitDate: Tue Dec 1 00:01:08 2015 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 0f9b810..993d72c 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 4) -set(CMake_VERSION_PATCH 20151130) +set(CMake_VERSION_PATCH 20151201) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Dec 1 08:49:58 2015 From: brad.king at kitware.com (Brad King) Date: Tue, 1 Dec 2015 08:49:58 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-1553-g343a2a6 Message-ID: <20151201134958.546C6D6ED4@public.kitware.com> 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 343a2a6fe2bf4ddd7b661fee1f6b1315247ae01d (commit) via fe05ad975292a2ff57a66746f1aa3870217f1ddd (commit) via e25f294a0e0aa03da4516d0baa488ad02cece089 (commit) from 523ccb5cf99486b8951bec2505c677310eee710a (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=343a2a6fe2bf4ddd7b661fee1f6b1315247ae01d commit 343a2a6fe2bf4ddd7b661fee1f6b1315247ae01d Merge: 523ccb5 fe05ad9 Author: Brad King AuthorDate: Tue Dec 1 08:49:57 2015 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 1 08:49:57 2015 -0500 Merge topic 'update-kwsys' into next fe05ad97 Merge branch 'upstream-kwsys' into update-kwsys e25f294a KWSys 2015-12-01 (9596e98d) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe05ad975292a2ff57a66746f1aa3870217f1ddd commit fe05ad975292a2ff57a66746f1aa3870217f1ddd Merge: 2218962 e25f294 Author: Brad King AuthorDate: Tue Dec 1 08:46:55 2015 -0500 Commit: Brad King CommitDate: Tue Dec 1 08:46:55 2015 -0500 Merge branch 'upstream-kwsys' into update-kwsys https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e25f294a0e0aa03da4516d0baa488ad02cece089 commit e25f294a0e0aa03da4516d0baa488ad02cece089 Author: KWSys Robot AuthorDate: Tue Dec 1 08:44:34 2015 -0500 Commit: Brad King CommitDate: Tue Dec 1 08:46:40 2015 -0500 KWSys 2015-12-01 (9596e98d) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 9596e98d | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' a7e5360f..9596e98d Dmitry Marakasov (1): b86a2a3e Process: Fix off-by-one when adding two times Marek Vasut (1): ddfa8019 CPU: Add NIOS2 support Rolf Eike Beer (2): 0adafb51 SystemTools: use FindProgram() overload that checks for directory 9596e98d SystemTools: move some code around that is used only on Windows-like platforms diff --git a/CPU.h.in b/CPU.h.in index 884d71a..66ffbb1 100644 --- a/CPU.h.in +++ b/CPU.h.in @@ -88,6 +88,10 @@ #elif defined(__mips) || defined(__mips__) || defined(__MIPS__) # define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_BIG +/* NIOS2 */ +#elif defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__) +# define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_LITTLE + /* OpenRISC 1000 */ #elif defined(__or1k__) # define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_BIG diff --git a/ProcessUNIX.c b/ProcessUNIX.c index 6d9b109..b0ddf5a 100644 --- a/ProcessUNIX.c +++ b/ProcessUNIX.c @@ -2241,7 +2241,7 @@ static kwsysProcessTime kwsysProcessTimeAdd(kwsysProcessTime in1, kwsysProcessTi kwsysProcessTime out; out.tv_sec = in1.tv_sec + in2.tv_sec; out.tv_usec = in1.tv_usec + in2.tv_usec; - if(out.tv_usec > 1000000) + if(out.tv_usec >= 1000000) { out.tv_usec -= 1000000; out.tv_sec += 1; diff --git a/SystemTools.cxx b/SystemTools.cxx index da34eb9..37fe421 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -2970,6 +2970,8 @@ std::string SystemTools::FindProgram( bool no_system_path) { std::vector extensions; + std::string tryPath; + #if defined (_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) bool hasExtension = false; // check to see if the name already has a .xxx at @@ -2983,22 +2985,22 @@ std::string SystemTools::FindProgram( { extensions.push_back(".com"); extensions.push_back(".exe"); - } -#endif - std::string tryPath; - // first try with extensions if the os supports them - for(std::vector::iterator i = - extensions.begin(); i != extensions.end(); ++i) - { - tryPath = name; - tryPath += *i; - if(SystemTools::FileExists(tryPath) && - !SystemTools::FileIsDirectory(tryPath)) + // first try with extensions if the os supports them + for(std::vector::iterator i = + extensions.begin(); i != extensions.end(); ++i) { - return SystemTools::CollapseFullPath(tryPath); + tryPath = name; + tryPath += *i; + if(SystemTools::FileExists(tryPath) && + !SystemTools::FileIsDirectory(tryPath)) + { + return SystemTools::CollapseFullPath(tryPath); + } } } +#endif + // now try just the name tryPath = name; if(SystemTools::FileExists(tryPath) && @@ -3048,8 +3050,7 @@ std::string SystemTools::FindProgram( tryPath = *p; tryPath += name; tryPath += *ext; - if(SystemTools::FileExists(tryPath) && - !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3057,8 +3058,7 @@ std::string SystemTools::FindProgram( // now try it without them tryPath = *p; tryPath += name; - if(SystemTools::FileExists(tryPath) && - !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3097,8 +3097,7 @@ std::string SystemTools const std::vector& userPaths) { // See if the executable exists as written. - if(SystemTools::FileExists(name) && - !SystemTools::FileIsDirectory(name)) + if(SystemTools::FileExists(name, true)) { return SystemTools::CollapseFullPath(name); } @@ -3144,8 +3143,7 @@ std::string SystemTools tryPath = *p; tryPath += name; tryPath += ".lib"; - if(SystemTools::FileExists(tryPath) - && !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3154,8 +3152,7 @@ std::string SystemTools tryPath += "lib"; tryPath += name; tryPath += ".so"; - if(SystemTools::FileExists(tryPath) - && !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3163,8 +3160,7 @@ std::string SystemTools tryPath += "lib"; tryPath += name; tryPath += ".a"; - if(SystemTools::FileExists(tryPath) - && !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3172,8 +3168,7 @@ std::string SystemTools tryPath += "lib"; tryPath += name; tryPath += ".sl"; - if(SystemTools::FileExists(tryPath) - && !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3181,8 +3176,7 @@ std::string SystemTools tryPath += "lib"; tryPath += name; tryPath += ".dylib"; - if(SystemTools::FileExists(tryPath) - && !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } @@ -3190,8 +3184,7 @@ std::string SystemTools tryPath += "lib"; tryPath += name; tryPath += ".dll"; - if(SystemTools::FileExists(tryPath) - && !SystemTools::FileIsDirectory(tryPath)) + if(SystemTools::FileExists(tryPath, true)) { return SystemTools::CollapseFullPath(tryPath); } ----------------------------------------------------------------------- Summary of changes: Source/kwsys/CPU.h.in | 4 ++++ Source/kwsys/ProcessUNIX.c | 2 +- Source/kwsys/SystemTools.cxx | 53 ++++++++++++++++++------------------------ 3 files changed, 28 insertions(+), 31 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Dec 1 09:00:50 2015 From: brad.king at kitware.com (Brad King) Date: Tue, 1 Dec 2015 09:00:50 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-1556-g67dbde4 Message-ID: <20151201140050.3F3CDD7A2F@public.kitware.com> 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 67dbde412032c40fec53387ac32e7361b208166b (commit) via 16f5d1843b3720729f50376f522550fcfa787a3c (commit) via a6f5281419c59b433f248b41972530242172a124 (commit) from 343a2a6fe2bf4ddd7b661fee1f6b1315247ae01d (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=67dbde412032c40fec53387ac32e7361b208166b commit 67dbde412032c40fec53387ac32e7361b208166b Merge: 343a2a6 16f5d18 Author: Brad King AuthorDate: Tue Dec 1 09:00:49 2015 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 1 09:00:49 2015 -0500 Merge topic 'include-for-mode_t' into next 16f5d184 Include `sys/types.h` header to get `mode_t` a6f52814 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16f5d1843b3720729f50376f522550fcfa787a3c commit 16f5d1843b3720729f50376f522550fcfa787a3c Author: Kylie McClain AuthorDate: Wed Nov 25 18:12:06 2015 -0500 Commit: Brad King CommitDate: Tue Dec 1 08:58:45 2015 -0500 Include `sys/types.h` header to get `mode_t` Do not depend on it being included by other system headers. It is not included by others on musl-libc, for example. diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index dd8fa9c..aed2e74 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -54,6 +54,8 @@ #if defined( _MSC_VER ) typedef unsigned short mode_t; +#else +# include #endif // use this class to shrink the size of symbols in .o files ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmStandardIncludes.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Dec 1 09:07:47 2015 From: brad.king at kitware.com (Brad King) Date: Tue, 1 Dec 2015 09:07:47 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-1558-g3a00e36 Message-ID: <20151201140747.E3B4CD7CD2@public.kitware.com> 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 3a00e367994cde14d1a23a753b5e281e6342554a (commit) via e10bfb77472f0a1706337e03d53f9c14c2347448 (commit) from 67dbde412032c40fec53387ac32e7361b208166b (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=3a00e367994cde14d1a23a753b5e281e6342554a commit 3a00e367994cde14d1a23a753b5e281e6342554a Merge: 67dbde4 e10bfb7 Author: Brad King AuthorDate: Tue Dec 1 09:07:47 2015 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 1 09:07:47 2015 -0500 Merge topic 'intel-compiler-features' into next e10bfb77 Revert "Features: Record standards and features for Intel C++ on UNIX" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e10bfb77472f0a1706337e03d53f9c14c2347448 commit e10bfb77472f0a1706337e03d53f9c14c2347448 Author: Brad King AuthorDate: Tue Dec 1 09:07:30 2015 -0500 Commit: Brad King CommitDate: Tue Dec 1 09:07:30 2015 -0500 Revert "Features: Record standards and features for Intel C++ on UNIX" This reverts commit 117d49b8b7671b7ad2901de444da725eda8ea8cc. It will be revised. diff --git a/Help/release/dev/intel-compiler-features.rst b/Help/release/dev/intel-compiler-features.rst deleted file mode 100644 index f154dc9..0000000 --- a/Help/release/dev/intel-compiler-features.rst +++ /dev/null @@ -1,6 +0,0 @@ -intel-compiler-features ------------------------ - -* The :manual:`Compile Features ` functionality - is now aware of features supported by Intel C++ compilers versions 12.1 - through 16.0 on UNIX platforms. diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake deleted file mode 100644 index 95792b0..0000000 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ /dev/null @@ -1,90 +0,0 @@ -# References: -# - https://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler -# - https://software.intel.com/en-us/articles/c14-features-supported-by-intel-c-compiler - -# these are not implemented in any version at time of writing -#set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}") -#set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}") - -# unknown if this is implemented -#set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel15_CXX14}") - -set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) || defined(__GXX_EXPERIMENTAL_CXX0X__))") -set(DETECT_CXX14 "((__cplusplus >= 201103L) && !defined(__INTEL_CXX11_MODE__))") - -set(Intel16_CXX14 "__ICC >= 1600 && ${DETECT_CXX14}") -set(_cmake_feature_test_cxx_contextual_conversions "${Intel16_CXX14}") -set(_cmake_feature_test_cxx_generic_lambdas "${Intel16_CXX14}") -set(_cmake_feature_test_cxx_digit_separators "${Intel16_CXX14}") -# This test is supposed to work in Intel 14 but the compiler has a bug -# in versions 14 and 15:: -# https://software.intel.com/en-us/forums/intel-c-compiler/topic/600514 -set(_cmake_feature_test_cxx_generalized_initializers "${Intel16_CXX14}") - -set(Intel15_CXX14 "__ICC >= 1500 && ${DETECT_CXX14}") -set(_cmake_feature_test_cxx_decltype_auto "${Intel15_CXX14}") -set(_cmake_feature_test_cxx_lambda_init_captures "${Intel15_CXX14}") -set(_cmake_feature_test_cxx_attribute_deprecated "${Intel15_CXX14}") -set(_cmake_feature_test_cxx_return_type_deduction "${Intel15_CXX14}") - -set(Intel15_CXX11 "__ICC >= 1500 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_alignas "${Intel15_CXX11}") -set(_cmake_feature_test_cxx_alignof "${Intel15_CXX11}") -set(_cmake_feature_test_cxx_inheriting_constructors "${Intel15_CXX11}") -set(_cmake_feature_test_cxx_user_literals "${Intel15_CXX11}") -set(_cmake_feature_test_cxx_thread_local "${Intel15_CXX11}") - -set(Intel14_CXX11 "${DETECT_CXX11} && (__ICC > 1400 || (__ICC == 1400 && __INTEL_COMPILER_UPDATE >= 2))") -# Documented as 12.0+ but in testing it only works on 14.0.2+ -set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${Intel14_CXX11}") - -set(Intel14_CXX11 "__ICC >= 1400 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_delegating_constructors "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_constexpr "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_sizeof_member "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_strong_enums "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_reference_qualified_functions "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_raw_string_literals "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_unicode_literals "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_inline_namespaces "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_unrestricted_unions "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_nonstatic_member_init "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_enum_forward_declarations "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_override "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_final "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_noexcept "${Intel14_CXX11}") -set(_cmake_feature_test_cxx_defaulted_move_initializers "${Intel14_CXX11}") - -set(Intel13_CXX11 "__ICC >= 1300 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_explicit_conversions "${Intel13_CXX11}") -set(_cmake_feature_test_cxx_range_for "${Intel13_CXX11}") -# Cannot find Intel documentation for N2640: cxx_uniform_initialization -set(_cmake_feature_test_cxx_uniform_initialization "${Intel13_CXX11}") - -set(Intel121_CXX11 "__ICC >= 1210 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_variadic_templates "${Intel121_CXX11}") -set(_cmake_feature_test_cxx_alias_templates "${Intel121_CXX11}") -set(_cmake_feature_test_cxx_nullptr "${Intel121_CXX11}") -set(_cmake_feature_test_cxx_trailing_return_types "${Intel121_CXX11}") -set(_cmake_feature_test_cxx_attributes "${Intel121_CXX11}") -set(_cmake_feature_test_cxx_default_function_template_args "${Intel121_CXX11}") - -set(Intel12_CXX11 "__ICC >= 1200 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_extended_friend_declarations "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_rvalue_references "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_decltype "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_defaulted_functions "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_deleted_functions "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_local_type_template_args "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_lambdas "${Intel12_CXX11}") - -set(_cmake_oldestSupported "__ICC >= 1110 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_binary_literals "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_static_assert "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_right_angle_brackets "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_auto_type "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_extern_templates "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_variadic_macros "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_long_long_type "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_func_identifier "${_cmake_oldestSupported}") -set(_cmake_feature_test_cxx_template_template_parameters "${_cmake_oldestSupported}") diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index 65f3134..7947695 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -8,58 +8,5 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT