[cmake-developers] [CMake 0014805]: Can not extract any famous library package on windows platform, include openssl and libbson
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14805 == Reported By:frank watson song Assigned To: == Project:CMake Issue ID: 14805 Category: (No Category) Reproducibility:have not tried Severity: minor Priority: normal Status: new == Date Submitted: 2014-03-14 14:22 HKT Last Modified: 2014-03-14 14:22 HKT == Summary:Can not extract any famous library package on windows platform, include openssl and libbson Description: Can not extract file from any package, the report include: CMake error : Problem with archive_write_header(): Can't create '\\?\E:\thirdparty_vc11\libbson\libbson-prefix\src\ex-libbson1234\libbson-0.6.4\doc\bson_init.txt' CMake error : Current file: libbson-0.6.4/doc/bson_init.txt Problem extracting tar: E:/thirdparty/libbson/libbson-0.6.4.tar.gz The url of this package is: https://codeload.github.com/mongodb/libbson/tar.gz/0.6.4 The relative problem can be found: http://public.kitware.com/Bug/view.php?id=13251 But it not resolved in 2.8.12.1 == Issue History Date ModifiedUsername FieldChange == 2014-03-14 14:22 frank watson songNew Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014806]: cmake does not detect correct intel c/c++ compiler version
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14806 == Reported By:dribbroc Assigned To: == Project:CMake Issue ID: 14806 Category: CMake Reproducibility:always Severity: minor Priority: low Status: new == Date Submitted: 2014-03-14 05:00 EDT Last Modified: 2014-03-14 05:00 EDT == Summary:cmake does not detect correct intel c/c++ compiler version Description: If used with intel cce 14.0.1 or 14.0.2 cmake reports -- The CXX compiler identification is Intel 14.0.0.20131008 or -- The CXX compiler identification is Intel 14.0.0.20140120, thus detecting the correct build date but the wrong version number. Steps to Reproduce: Just set CXX to icpc and configure any cmake project with 'cmake .' while using an icpc version greater then 14.0.0. Additional Information: The mechanism how intel reports its compiler version has changed between 13 and 14 but i happen to not find the corresponding files at this moment :( == Issue History Date ModifiedUsername FieldChange == 2014-03-14 05:00 dribbroc New Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014807]: ExternalProject_Add needs a way to silence progress output (and progress output is bogus)
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14807 == Reported By:John Szakmeister Assigned To: == Project:CMake Issue ID: 14807 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-03-14 05:05 EDT Last Modified: 2014-03-14 05:05 EDT == Summary:ExternalProject_Add needs a way to silence progress output (and progress output is bogus) Description: We're using ExternalProject_Add to help build dependencies, but it can lead to nearly 3,000 lines of progress output as seen here: https://travis-ci.org/neovim/neovim/jobs/20601268#L826 It'd be nice if CMake provided a way to disable that output. Plus, the output is bogus. The first output was 100%, then 0%, then 739%, and ending at 3069066%. Finally, this issue would've been easy to work around had the download, verify, and extract steps been exposed separately. Since they're not, it a substantial amount of work, just to avoid seeing 3,000 lines of progress. :-( == Issue History Date ModifiedUsername FieldChange == 2014-03-14 05:05 John SzakmeisterNew Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
On 03/13/2014 05:29 PM, Jiri Malak wrote: I enclosed patch to fix COMPILER_VERSION variable value for Open Watcom compilers to be real version, not internal number. [snip] + /* __WATCOMC__ = VVRR + 1100 Open Watcom */ What do you think about changing the compiler id to OpenWatcom? Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
I enclosed patch to fix COMPILER_VERSION variable value for Open Watcom compilers to be real version, not internal number. [snip] + /* __WATCOMC__ = VVRR + 1100 Open Watcom */ What do you think about changing the compiler id to OpenWatcom? Thanks, -Brad It can be changed, I am using Watcom as simple word. Jiri -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
On 03/14/2014 09:38 AM, Jiri Malak wrote: I enclosed patch to fix COMPILER_VERSION variable value for Open Watcom compilers to be real version, not internal number. [snip] + /* __WATCOMC__ = VVRR + 1100 Open Watcom */ What do you think about changing the compiler id to OpenWatcom? It can be changed, I am using Watcom as simple word. My concern is that we've reported CMAKE_C_COMPILER_ID as Watcom along with CMAKE_C_COMPILER_VERSION holding numbers like 12.x for a long time. Projects may have logic that switches off these version values when they see the id is Watcom. By changing to OpenWatcom we get a more accurate description of the compiler name and can restart the version sequence at 1.x. Please fold this into the patch. Also please split the patch into two commits. The first should do the compiler id and version change, and the second should do the platform and architecture fix. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
I enclosed patch to fix COMPILER_VERSION variable value for Open Watcom compilers to be real version, not internal number. [snip] + /* __WATCOMC__ = VVRR + 1100 Open Watcom */ What do you think about changing the compiler id to OpenWatcom? It can be changed, I am using Watcom as simple word. My concern is that we've reported CMAKE_C_COMPILER_ID as Watcom along with CMAKE_C_COMPILER_VERSION holding numbers like 12.x for a long time. Projects may have logic that switches off these version values when they see the id is Watcom. By changing to OpenWatcom we get a more accurate description of the compiler name and can restart the version sequence at 1.x. Please fold this into the patch. Also please split the patch into two commits. The first should do the compiler id and version change, and the second should do the platform and architecture fix. OK. I introduce OpenWatcom as new compiler ID. Jiri -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
My concern is that we've reported CMAKE_C_COMPILER_ID as Watcom along with CMAKE_C_COMPILER_VERSION holding numbers like 12.x for a long time. Projects may have logic that switches off these version values when they see the id is Watcom. By changing to OpenWatcom we get a more accurate description of the compiler name and can restart the version sequence at 1.x. Please fold this into the patch. Brad, It is now a litle complicated because numbering used by CMake is old Watcom. By example for Watcom 10.6 CMake reported 10.6 (CMAKE_C_COMPILER_VERSION variable), but for Open Watcom numbering is shifted by 1100 that for Open Watcom 1.0 CMake reports 12.0 (CMAKE_C_COMPILER_VERSION value). Fix ensure that Open Watcom 1.0 will be reported correctly as 1.0 and CMAKE_C_COMPILER_VERSION will be 1.0 etc. Now question, how Open Watcom 1.9 should be identified. If it will be Watcom then version should be 12.90 if it will be OpenWatcom then version will be 1.9. Correct is OpenWatcom, but in this case old configuration will not understand OpenWatcom ID. Jiri -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014808]: Policy CMP0026 set OLD not working
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14808 == Reported By:Michał Cichoń Assigned To: == Project:CMake Issue ID: 14808 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-03-14 11:36 EDT Last Modified: 2014-03-14 11:36 EDT == Summary:Policy CMP0026 set OLD not working Description: CMake is no longer able to return CONFIG_LOCATION even if policy is explicitly set. Instead LOCATION_CONFIG return desired values. Backward compatibility therefore is broken. Steps to Reproduce: Call on any target: get_target_property(result target_name DEBUG_LOCATION) You will get: result-NOTFOUND Sould be: path to location for debug configuration. == Issue History Date ModifiedUsername FieldChange == 2014-03-14 11:36 Michał Cichoń New Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
On 03/14/2014 11:27 AM, Jiri Malak wrote: It is now a litle complicated because numbering used by CMake is old Watcom. By example for Watcom 10.6 CMake reported 10.6 (CMAKE_C_COMPILER_VERSION variable), but for Open Watcom numbering is shifted by 1100 that for Open Watcom 1.0 CMake reports 12.0 (CMAKE_C_COMPILER_VERSION value). Fix ensure that Open Watcom 1.0 will be reported correctly as 1.0 and CMAKE_C_COMPILER_VERSION will be 1.0 etc. Now question, how Open Watcom 1.9 should be identified. If it will be Watcom then version should be 12.90 if it will be OpenWatcom then version will be 1.9. We could do something like: #elif defined(__WATCOMC__) # if __WATCOMC__ = 1200 # define COMPILER_ID OpenWatcom /* __WATCOMC__ = VVRR + 1100, Open Watcom */ # define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100 ) / 100) # define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) # else # define COMPILER_ID Watcom /* __WATCOMC__ = VVRR, Old Watcom */ # define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100) # define COMPILER_VERSION_MINOR DEC(__WATCOMC__ % 100) # endif Correct is OpenWatcom, but in this case old configuration will not understand OpenWatcom ID. Policies CMP0025 and CMP0047 change some existing compiler ids. Another one could be introduced for this case to map OpenWatcom back to Watcom and add 11 to the compiler major version. Of course it will cause warnings in every project when building with OpenWatcom until their cmake_minimum_required version is high enough to set the policy. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] Correct platform related variables for Open Watcom compilers
I enclosed both patches.
Regards
JiriFrom 64effa52febef30653e5c4deb6a6df114e543eb1 Mon Sep 17 00:00:00 2001
From: Jiri Malak malak.j...@gmail.com
Date: Fri, 14 Mar 2014 18:42:58 +0100
Subject: [PATCH 1/2] Corrections for Open Watcom compiler version
Add new compiler ID OpenWatcom for Open Watcom compilers, Watcom is used for original Watcom compilers
Correct COMPILER_VERSION variable to hold real Open Watcom compiler version
---
Modules/CMakeCCompilerId.c.in| 15 ++
Modules/CMakeCXXCompilerId.cpp.in| 15 ++
Modules/GenerateExportHeader.cmake | 6 --
Modules/InstallRequiredSystemLibraries.cmake | 7 ---
Modules/Platform/Windows-wcl386.cmake| 26 ++--
Source/cmExtraCodeBlocksGenerator.cxx| 2 +-
Tests/Module/GenerateExportHeader/CMakeLists.txt | 3 ++-
Tests/RunCMake/CMakeLists.txt| 1 +
8 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 52f9590..07d2aff 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -64,10 +64,17 @@
# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ 0xFF)
#elif defined(__WATCOMC__)
-# define COMPILER_ID Watcom
- /* __WATCOMC__ = VVRR */
-# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100)
-# define COMPILER_VERSION_MINOR DEC(__WATCOMC__ % 100)
+# if __WATCOMC__ 1200
+# define COMPILER_ID Watcom
+ /* __WATCOMC__ = VVRR Watcom */
+# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100)
+# define COMPILER_VERSION_MINOR DEC(__WATCOMC__ % 100)
+#else
+# define COMPILER_ID OpenWatcom
+ /* __WATCOMC__ = VVRR + 1100 Open Watcom */
+# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100 ) / 100)
+# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10)
+# endif
#elif defined(__SUNPRO_C)
# define COMPILER_ID SunPro
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 25ceb3f..e01794c 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -69,10 +69,17 @@
# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ 0xFF)
#elif defined(__WATCOMC__)
-# define COMPILER_ID Watcom
- /* __WATCOMC__ = VVRR */
-# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100)
-# define COMPILER_VERSION_MINOR DEC(__WATCOMC__ % 100)
+# if __WATCOMC__ 1200
+# define COMPILER_ID Watcom
+ /* __WATCOMC__ = VVRR Watcom */
+# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100)
+# define COMPILER_VERSION_MINOR DEC(__WATCOMC__ % 100)
+#else
+# define COMPILER_ID OpenWatcom
+ /* __WATCOMC__ = VVRR + 1100 Open Watcom */
+# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100 ) / 100)
+# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10)
+# endif
#elif defined(__SUNPRO_CC)
# define COMPILER_ID SunPro
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index f83f992..0251eaf 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -220,7 +220,8 @@ macro(_test_compiler_hidden_visibility)
AND NOT CYGWIN
AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES XL
AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES PGI
- AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Watcom)
+ AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Watcom
+ AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES OpenWatcom)
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
check_cxx_compiler_flag(-fvisibility-inlines-hidden
COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
@@ -235,7 +236,8 @@ macro(_test_compiler_has_deprecated)
OR ${CMAKE_CXX_COMPILER_ID} MATCHES HP
OR GCC_TOO_OLD
OR ${CMAKE_CXX_COMPILER_ID} MATCHES PGI
- OR ${CMAKE_CXX_COMPILER_ID} MATCHES Watcom)
+ OR ${CMAKE_CXX_COMPILER_ID} MATCHES Watcom
+ OR ${CMAKE_CXX_COMPILER_ID} MATCHES OpenWatcom)
set(COMPILER_HAS_DEPRECATED CACHE INTERNAL
Compiler support for a deprecated attribute)
else()
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 7e68e8f..62af377 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -368,16 +368,17 @@ if(WATCOM)
get_filename_component( CompilerPath ${CMAKE_C_COMPILER} PATH )
if(CMAKE_C_COMPILER_VERSION)
set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
+set(_compiler_id ${CMAKE_C_COMPILER_ID})
else()
set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
+set(_compiler_id ${CMAKE_CXX_COMPILER_ID})
endif()
string(REGEX MATCHALL [0-9]+ _watcom_version_list ${_compiler_version})
list(GET _watcom_version_list 0 _watcom_major)
list(GET _watcom_version_list 1 _watcom_minor)
- if(${_watcom_major} GREATER 11)
-math(EXPR _watcom_major ${_watcom_major} - 11)
+ if(_compiler_id MATCHES Watcom)
+math(EXPR
[CMake] Regarding CMAKE and OSX Mavericks
To Whom It May Concern,I am currently a Student attempting to use OPENGL on OSX Mavericks, however in order to use some of the latest GLFW libraries I require to compile source files to apply them, however when attempting to use CMAKE I get the following error:CMAKE Version : 3.0.0 rc 1My current system version.OS: OSX 10.9.2XCODE: 5.0.2The C compiler identification is unknownCMake Error at CMakeLists.txt:1 (project): No CMAKE_C_COMPILER could be found.Configuring incomplete, errors occurred!See also "/Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/CMakeOutput.log".See also "/Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/CMakeError.log". CMakeError.log Description: Binary data CMakeOutput.log Description: Binary data gcc version:Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)Target: x86_64-apple-darwin13.1.0Thread model: posixMake version:GNU Make 3.81Copyright (C) 2006 Free Software Foundation, Inc.This is free software; see the source for copying conditions.There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR APARTICULAR PURPOSE.This program built for i386-apple-darwin11.3.0Kind RegardsTheodore.-- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Regarding CMAKE and OSX Mavericks
Using cmake 2.8.12.2 on MacOSX 10.9.2 detects correctly the compiler On 14 Mar 2014, at 14:57, Theodore St. Shenouda fr.theod...@bigpond.com wrote: To Whom It May Concern, I am currently a Student attempting to use OPENGL on OSX Mavericks, however in order to use some of the latest GLFW libraries I require to compile source files to apply them, however when attempting to use CMAKE I get the following error: CMAKE Version : 3.0.0 rc 1 My current system version. OS:OSX 10.9.2 XCODE: 5.0.2 The C compiler identification is unknown CMake Error at CMakeLists.txt:1 (project): No CMAKE_C_COMPILER could be found. Configuring incomplete, errors occurred! See also /Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/CMakeOutput.log. See also /Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/CMakeError.log. CMakeError.log CMakeOutput.log gcc version: Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1 Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) Target: x86_64-apple-darwin13.1.0 Thread model: posix Make version: GNU Make 3.81 Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. This program built for i386-apple-darwin11.3.0 Kind Regards Theodore. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Fortran_FORMAT
I figured it out. My version of Cmake (2.8.2) does not have the Fortran_FORMAT property. Thanks! On Thu, Mar 13, 2014 at 1:15 PM, Nils Gladitz nilsglad...@gmail.com wrote: On 13.03.2014 17:40, Jack Stalnaker wrote: Can someone provide an example of Fortran_FORMAT in use? I cannot find anything other than a definition of the property online. Does one use I am not much of a Fortran person but: cmake_minimum_required(VERSION 2.8.12) project(Foo Fortran) add_executable(free free.f) set_target_properties(free PROPERTIES Fortran_FORMAT FREE) add_executable(fixed fixed.f) set_target_properties(fixed PROPERTIES Fortran_FORMAT FIXED) Produces the following compile command on my system (with the gnu Fortran compiler): /usr/bin/f95-ffixed-form -c /home/ngladitz/src/test/fortran/fixed.f -o CMakeFiles/fixed.dir/fixed.f.o /usr/bin/f95-ffree-form -c /home/ngladitz/src/test/fortran/free.f -o CMakeFiles/free.dir/free.f.o The respective -ffixed-form -ffree-form options are compiler specific. Which compiler are you using? Nils -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Reverted to 2.8.12.8
I have reverted back to the below version, however the following error occurs, CMAKE Version : 2.8.12.2 My current system version. OS:OSX 10.9.2 XCODE: 5.0.2 CMake Error at /Applications/CMake 2.8-12.app/Contents/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake:446 (execute_process): execute_process given COMMAND argument with no value. Call Stack (most recent call first): /Applications/CMake 2.8-12.app/Contents/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake:48 (CMAKE_DETERMINE_COMPILER_ID_VENDOR) /Applications/CMake 2.8-12.app/Contents/share/cmake-2.8/Modules/CMakeDetermineCCompiler.cmake:131 (CMAKE_DETERMINE_COMPILER_ID) CMakeLists.txt:1 (project) The C compiler identification is unknown CMake Error at /Applications/CMake 2.8-12.app/Contents/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:108 (message): Could NOT find Threads (missing: Threads_FOUND) Call Stack (most recent call first): /Applications/CMake 2.8-12.app/Contents/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:315 (_FPHSA_FAILURE_MESSAGE) /Applications/CMake 2.8-12.app/Contents/share/cmake-2.8/Modules/FindThreads.cmake:166 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) CMakeLists.txt:75 (find_package) Configuring incomplete, errors occurred! See also /Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/CMakeOutput.log. See also /Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/CMakeError.log. gcc version: Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1 Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) Target: x86_64-apple-darwin13.1.0 Thread model: posix Make version: GNU Make 3.81 Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. This program built for i386-apple-darwin11.3.0 Kind Regards Theodore. -- -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] CMAKE_CURRENT_LIST_DIR equivalent 2.8.2
I'm stuck at 2.8.2. Is there an equivalent or a workaround for CMAKE_CURRENT_LIST_DIR in this version? Thanks. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Regarding CMAKE and OSX Mavericks
On Sat, 15 Mar 2014 00:57:16 +1100, Theodore St. Shenouda said: CMAKE Version : 3.0.0 rc 1 My current system version. OS:OSX 10.9.2 XCODE: 5.0.2 The C compiler identification is unknown CMake Error at CMakeLists.txt:1 (project): No CMAKE_C_COMPILER could be found. Configuring incomplete, errors occurred! See also /Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/ CMakeOutput.log. See also /Users/theodorestshenouda/Desktop/glfw-3.0.4/Build/CMakeFiles/ CMakeError.log. gcc version: Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1 Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) Target: x86_64-apple-darwin13.1.0 Thread model: posix Are you the one passing --prefix= and --with-gxx-include-dir? If so, why? What do the following output: xcrun --find cc xcode-select --print-path BTW: OS 10.9 Xcode 5 do not provide *any* version of gcc, only clang. There's a gcc symlink for compatibility (as surely many tools/scripts assume its existence), but it's not really gcc at all. Cheers, -- Sean McBride, B. Eng s...@rogue-research.com Rogue Researchwww.rogue-research.com Mac Software Developer Montréal, Québec, Canada -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMAKE_CURRENT_LIST_DIR equivalent 2.8.2
I do this to avoid using CMAKE_CURRENT_LIST_DIR in projects that must
still work with older CMake versions:
get_filename_component(_self_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
After that call, the variable _self_dir has equivalent content to the
present-day CMAKE_CURRENT_LIST_DIR.
CMAKE_CURRENT_LIST_FILE has been around for much longer.
HTH,
David C.
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake Tools for Visual Studio 1.1 Released!
Maybe you could update the project description to indicate it supports VS2013. When i first clicked the link i got a bit disappointed because it said only 2010 and 2012 are supported. Only when i re-read the mail later i saw 2013 is actually supported. Simon On Tue, Feb 25, 2014 at 2:20 AM, David Golub golu...@gmail.com wrote: I just released version 1.1 of CMake Tools for Visual Studio. This release includes support for Visual Studio 2013 and CMake 2.8.12, as well as a number of smaller new features and bug fixes. It is available from the project web site at http://cmaketools.codeplex.com. Enjoy! David Golub -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake Tools for Visual Studio 1.1 Released!
An oversight on my part. It's fixed now. I apologize for any confusion. David Golub From: Simon Sasburg [mailto:simon.sasb...@gmail.com] Sent: Friday, March 14, 2014 9:39 PM To: David Golub Cc: CMake ML Subject: Re: [CMake] CMake Tools for Visual Studio 1.1 Released! Maybe you could update the project description to indicate it supports VS2013. When i first clicked the link i got a bit disappointed because it said only 2010 and 2012 are supported. Only when i re-read the mail later i saw 2013 is actually supported. Simon On Tue, Feb 25, 2014 at 2:20 AM, David Golub golu...@gmail.com wrote: I just released version 1.1 of CMake Tools for Visual Studio. This release includes support for Visual Studio 2013 and CMake 2.8.12, as well as a number of smaller new features and bug fixes. It is available from the project web site at http://cmaketools.codeplex.com. Enjoy! David Golub -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Auto made projects
I have a cmake script that writes build commands to build a chain of other
cmake scripts... to get the appropriate build command for the generator
selected I do something like.
build_command( BUILD_COMMAND CONFIGURATION ${CMAKE_BUILD_TYPE}
PROJECT_NAME ${SOLUTION} TARGET install )
SEPARATE_ARGUMENTS( BUILD_COMMAND UNIX_COMMAND ${BUILD_COMMAND} )
string (REPLACE ; FAKE_BUILD_COMMAND ${BUILD_COMMAND})
FILE( APPEND ${BUILD}/${SCRIPTNAME} ${FAKE_BUILD_COMMAND} )
The problem is, under makefiles... watcom makefiles, mingwmakefiles, or
unix makefiles build_command ends up being make -i install
I don't really want it to have the -i I can add another string replace;
why is the build_command set to ignore errors?
CMake 2.8.10.2
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1012-gf851206
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 f851206bae9b9f3ecf8c01e4f52c32ffa896bfe2 (commit)
via 3e3504f3c90aecc4acd213856541253bc524f8d8 (commit)
from 47344e2137ab8b5059ed017baf3dbdbcad95a5a0 (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=f851206bae9b9f3ecf8c01e4f52c32ffa896bfe2
commit f851206bae9b9f3ecf8c01e4f52c32ffa896bfe2
Merge: 47344e2 3e3504f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 03:44:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 03:44:28 2014 -0400
Merge topic 'fix-Qt5-windows-build' into next
3e3504f3 Linking to the Qt4 IMPORTED libraries is not sufficient.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e3504f3c90aecc4acd213856541253bc524f8d8
commit 3e3504f3c90aecc4acd213856541253bc524f8d8
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 08:43:10 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Mar 14 08:43:10 2014 +0100
Linking to the Qt4 IMPORTED libraries is not sufficient.
Append to the list to link to instead of replacing it.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 608ee08..fd7d68a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
include(${QT_USE_FILE})
- set(QT_LIBRARIES Qt4::QtGui Qt4::QtCore)
+ list(APPEND QT_LIBRARIES Qt4::QtGui Qt4::QtCore)
if(WIN32 AND EXISTS ${QT_QMAKE_EXECUTABLE})
get_filename_component(_Qt_BIN_DIR ${QT_QMAKE_EXECUTABLE} PATH)
---
Summary of changes:
Source/QtDialog/CMakeLists.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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1018-g03ce61a
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 03ce61a5017fb475019b778146c9bc9d107114a7 (commit) via 1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 (commit) from 3aafa45107d37d75ef969877158367479a268fed (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=03ce61a5017fb475019b778146c9bc9d107114a7 commit 03ce61a5017fb475019b778146c9bc9d107114a7 Merge: 3aafa45 1af77f3 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Fri Mar 14 06:52:24 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 06:52:24 2014 -0400 Merge topic 'FeatureSummary_missing_titles' into next 1af77f3f FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 commit 1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Fri Mar 14 11:51:45 2014 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Fri Mar 14 11:51:51 2014 +0100 FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND Since now these can be used with the WHAT argument a title is required. diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 6696515..a72954c 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -492,6 +492,8 @@ function(FEATURE_SUMMARY) set(title_ENABLED_FEATURES The following features have been enabled:) set(title_DISABLED_FEATURES The following features have been disabled:) +set(title_PACKAGES_FOUND The following packages have been found:) +set(title_PACKAGES_NOT_FOUND The following packages have not been found:) set(title_OPTIONAL_PACKAGES_FOUNDThe following OPTIONAL packages have been found:) set(title_OPTIONAL_PACKAGES_NOT_FOUNDThe following OPTIONAL packages have not been found:) set(title_RECOMMENDED_PACKAGES_FOUND The following RECOMMENDED packages have been found:) --- Summary of changes: Modules/FeatureSummary.cmake |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1022-gc126b8c
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 c126b8c14505282cc22af4b719b58114f78c83f7 (commit)
via 7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c (commit)
via 17f471d01bc5cf92be93c1e03241fbb9d1bd8d77 (commit)
via f92203ba4955878f4fdb969c2078a91f7f9c2dac (commit)
from 03ce61a5017fb475019b778146c9bc9d107114a7 (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=c126b8c14505282cc22af4b719b58114f78c83f7
commit c126b8c14505282cc22af4b719b58114f78c83f7
Merge: 03ce61a 7ccae4d
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Mar 14 07:15:13 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 07:15:13 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next
7ccae4dd FindPkgConfig - Unit tests: Add quotes when setting
CMAKE_PREFIX_PATH
17f471d0 FindPkgConfig - Unit tests: Fix dummy pkg-config scripts
f92203ba FindPkgConfig: Fix TO_NATIVE_PATH escaping white spaces
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c
commit 7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Mar 14 12:12:13 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Mar 14 12:14:37 2014 +0100
FindPkgConfig - Unit tests: Add quotes when setting CMAKE_PREFIX_PATH
This should fix when CMAKE_CURRENT_SOURCE_DIR contains a white space
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
index e218247..5f9913f 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
@@ -3,7 +3,7 @@ enable_language(C)
# Prepare environment and variables
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
+set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
if(WIN32)
set(PKG_CONFIG_EXECUTABLE
${CMAKE_CURRENT_SOURCE_DIR}\\dummy-pkg-config.bat)
set(ENV{CMAKE_PREFIX_PATH}
${CMAKE_CURRENT_SOURCE_DIR}\\pc-bar;X:\\this\\directory\\should\\not\\exist\\in\\the\\filesystem)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17f471d01bc5cf92be93c1e03241fbb9d1bd8d77
commit 17f471d01bc5cf92be93c1e03241fbb9d1bd8d77
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Mar 14 12:04:25 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Mar 14 12:14:27 2014 +0100
FindPkgConfig - Unit tests: Fix dummy pkg-config scripts
diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
index f068897..b2096ed 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
@@ -8,7 +8,8 @@ IF %1==--version (
)
IF %1==--exists (
- IF NOT %2==%PKG_CONFIG_PATH% (
+ SHIFT
+ IF NOT %*==%PKG_CONFIG_PATH% (
EXIT /B 1
)
)
diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
index e0e6a54..e62bb74 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
@@ -9,7 +9,10 @@ case $1 in
echo 0.0-cmake-dummy
;;
--exists)
-[ $2 = ${PKG_CONFIG_PATH} ] || exit 1
+shift
+echo $@
+echo ${PKG_CONFIG_PATH}
+[ $@ = ${PKG_CONFIG_PATH} ] || exit 1
;;
*)
exit 255
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f92203ba4955878f4fdb969c2078a91f7f9c2dac
commit f92203ba4955878f4fdb969c2078a91f7f9c2dac
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Mar 14 12:05:55 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Mar 14 12:14:17 2014 +0100
FindPkgConfig: Fix TO_NATIVE_PATH escaping white spaces
White spaces in the environment variables should not be escaped
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index fee45b6..812bb92 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -255,6 +255,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
file(TO_NATIVE_PATH ${_pkgconfig_path} _pkgconfig_path)
if(UNIX)
string(REPLACE ; : _pkgconfig_path ${_pkgconfig_path})
+ string(REPLACE \\_pkgconfig_path ${_pkgconfig_path})
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1025-gccab252
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 ccab25270642b610f00f31960adde7b4bf987d8c (commit)
via 59220198022d2e081ddba164c1ec62a6e9d438eb (commit)
via a9e6de2acc1ac2e51b4d737b3abbeee3bf43832c (commit)
from c126b8c14505282cc22af4b719b58114f78c83f7 (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=ccab25270642b610f00f31960adde7b4bf987d8c
commit ccab25270642b610f00f31960adde7b4bf987d8c
Merge: c126b8c 5922019
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 14 09:14:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 09:14:28 2014 -0400
Merge topic 'different-python-header-libs-exe-0013794' into next
59220198 FindPython*: Document suggested find_package order (#13794)
a9e6de2a FindPythonInterp: Use consistent version with PythonLibs (#13794)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59220198022d2e081ddba164c1ec62a6e9d438eb
commit 59220198022d2e081ddba164c1ec62a6e9d438eb
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Thu Mar 13 11:19:11 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 14 09:11:26 2014 -0400
FindPython*: Document suggested find_package order (#13794)
Document in both FindPythonInterp.cmake and FindPythonLibs.cmake that
find_package(PythonInterp) should be called before find_package(PythonLibs).
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 780cda8..f8ff5d8 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -27,6 +27,10 @@
# of version numbers that should be taken into account when searching
# for Python. You need to set this variable before calling
# find_package(PythonInterp).
+#
+# If also calling find_package(PythonLibs), call find_package(PythonInterp)
+# first to get the currently active Python version by default with a consistent
+# version of PYTHON_LIBRARIES.
#=
# Copyright 2005-2010 Kitware, Inc.
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 656ed7b..1f90f5b 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -31,6 +31,10 @@
#
# PYTHON_LIBRARY - path to the python library
# PYTHON_INCLUDE_DIR - path to where Python.h is found
+#
+# If also calling find_package(PythonInterp), call find_package(PythonInterp)
+# first to get the currently active Python version by default with a consistent
+# version of PYTHON_LIBRARIES.
#=
# Copyright 2001-2009 Kitware, Inc.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9e6de2acc1ac2e51b4d737b3abbeee3bf43832c
commit a9e6de2acc1ac2e51b4d737b3abbeee3bf43832c
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Wed Mar 5 17:01:26 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 14 09:09:58 2014 -0400
FindPythonInterp: Use consistent version with PythonLibs (#13794)
If
find_package(PythonLibs)
find_package(PythonInterp)
is called, help PythonInterp to get a version of PYTHON_EXECUTABLE
consistent with the library versions found by PythonLibs.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 8da848c..780cda8 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -71,18 +71,23 @@ if(PythonInterp_FIND_VERSION)
else()
set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS}
${_PYTHON1_VERSIONS})
endif()
-
-list(APPEND _Python_NAMES python)
-
-# Search for the current active python version first
find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
# Set up the versions we know about, in the order we will search. Always add
# the user supplied additional versions to the front.
-set(_Python_VERSIONS
- ${Python_ADDITIONAL_VERSIONS}
- ${_PYTHON_FIND_OTHER_VERSIONS}
- )
+set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
+# If FindPythonInterp has already found the major and minor version,
+# insert that version next to get consistent versions of the interpreter and
+# library.
+if(DEFINED PYTHONLIBS_VERSION_STRING)
+ string(REPLACE . ; _PYTHONLIBS_VERSION ${PYTHONLIBS_VERSION_STRING})
+ list(GET _PYTHONLIBS_VERSION 0 _PYTHONLIBS_VERSION_MAJOR)
+ list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR)
+ list(APPEND _Python_VERSIONS
${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR})
+endif()
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-297-ge623605
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 e623605ed6e7f4645c124e4ad3c07ef3e7a7682d (commit) via 328c217960ac3ee92270739a2dc4fc9d566789c3 (commit) from 9a026b902b7c7c263e6c3a70f755f974e8953132 (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=e623605ed6e7f4645c124e4ad3c07ef3e7a7682d commit e623605ed6e7f4645c124e4ad3c07ef3e7a7682d Merge: 9a026b9 328c217 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:30:21 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:30:21 2014 -0400 Merge topic 'doc-cmake-developer-no-cmStdString' 328c2179 Help: Drop cmStdString from cmake-developer(7) examples --- Summary of changes: Help/manual/cmake-developer.7.rst | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-309-g76845bd
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 76845bdbf4ad5e3272710d64ac763b5f28e37567 (commit) via 1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 (commit) from 67a0d5e4c4c2b7379538bbc29f349c7fb2205947 (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=76845bdbf4ad5e3272710d64ac763b5f28e37567 commit 76845bdbf4ad5e3272710d64ac763b5f28e37567 Merge: 67a0d5e 1af77f3 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:30:28 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:30:28 2014 -0400 Merge topic 'FeatureSummary_missing_titles' 1af77f3f FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND --- Summary of changes: Modules/FeatureSummary.cmake |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-305-g92b423f
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 92b423fc2f504c645405669ffa5659c2268c6445 (commit) via 59220198022d2e081ddba164c1ec62a6e9d438eb (commit) via a9e6de2acc1ac2e51b4d737b3abbeee3bf43832c (commit) from 32b7d2ed8a4286de5db18883b1db7cdc4f902598 (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=92b423fc2f504c645405669ffa5659c2268c6445 commit 92b423fc2f504c645405669ffa5659c2268c6445 Merge: 32b7d2e 5922019 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:30:24 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:30:24 2014 -0400 Merge topic 'different-python-header-libs-exe-0013794' 59220198 FindPython*: Document suggested find_package order (#13794) a9e6de2a FindPythonInterp: Use consistent version with PythonLibs (#13794) --- Summary of changes: Modules/FindPythonInterp.cmake | 27 ++- Modules/FindPythonLibs.cmake |4 2 files changed, 22 insertions(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-311-gdafa80e
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 dafa80ecc03eea8c75371e98e626679a3f96d5a9 (commit) via 13778cd3be03de966c006b7acc6c1ec07019ab07 (commit) from 76845bdbf4ad5e3272710d64ac763b5f28e37567 (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=dafa80ecc03eea8c75371e98e626679a3f96d5a9 commit dafa80ecc03eea8c75371e98e626679a3f96d5a9 Merge: 76845bd 13778cd Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:30:29 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:30:29 2014 -0400 Merge topic 'cpack-deb-compression-types' 13778cd3 CPackDeb: Add option to set compression type --- Summary of changes: Modules/CPackDeb.cmake | 13 +- Source/CPack/cmCPackDebGenerator.cxx | 46 +++--- 2 files changed, 49 insertions(+), 10 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-302-g32b7d2e
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 32b7d2ed8a4286de5db18883b1db7cdc4f902598 (commit)
via a25b809f2075828e5ae488f74d85f5a31940460a (commit)
via 9914e7cd95b29ee85653ab952a377f61dabd5190 (commit)
via 34cd5fc451f8ff732ba192165ddf344dd9adcc68 (commit)
via d363cbf3156c5e8ef160ffbb45cfa269addebb50 (commit)
from e623605ed6e7f4645c124e4ad3c07ef3e7a7682d (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=32b7d2ed8a4286de5db18883b1db7cdc4f902598
commit 32b7d2ed8a4286de5db18883b1db7cdc4f902598
Merge: e623605 a25b809
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 14 09:30:23 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 09:30:23 2014 -0400
Merge topic 'fix-find_dependency-empty-version'
a25b809f Tests: Check find_dependency empty extra arguments
9914e7cd Merge branch 'fix-find_dependency-empty-version'
34cd5fc4 find_dependency: Give more helpful message if VERSION is empty
d363cbf3 Tests: Make RunCMake.find_dependency tolerate line number changes
---
Summary of changes:
Modules/CMakeFindDependencyMacro.cmake |7 +--
Tests/RunCMake/find_dependency/EXACT-no-version-stderr.txt |2 +-
Tests/RunCMake/find_dependency/RunCMakeTest.cmake |2 ++
.../empty-arg-3-result.txt} |0
Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt |5 +
.../{EXACT-no-version.cmake = empty-arg-3.cmake} |2 +-
.../empty-version-result.txt} |0
Tests/RunCMake/find_dependency/empty-version-stderr.txt |5 +
.../{EXACT-no-version.cmake = empty-version.cmake} |2 +-
Tests/RunCMake/find_dependency/extra-args-stderr.txt|2 +-
Tests/RunCMake/find_dependency/invalid-arg-3-stderr.txt |2 +-
11 files changed, 22 insertions(+), 7 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
find_dependency/empty-arg-3-result.txt} (100%)
create mode 100644 Tests/RunCMake/find_dependency/empty-arg-3-stderr.txt
copy Tests/RunCMake/find_dependency/{EXACT-no-version.cmake =
empty-arg-3.cmake} (54%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
find_dependency/empty-version-result.txt} (100%)
create mode 100644 Tests/RunCMake/find_dependency/empty-version-stderr.txt
copy Tests/RunCMake/find_dependency/{EXACT-no-version.cmake =
empty-version.cmake} (55%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1027-g5061552
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 50615522c7c89f26b9cd4b162a6e21690cb40cd8 (commit)
via 13778cd3be03de966c006b7acc6c1ec07019ab07 (commit)
from ccab25270642b610f00f31960adde7b4bf987d8c (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=50615522c7c89f26b9cd4b162a6e21690cb40cd8
commit 50615522c7c89f26b9cd4b162a6e21690cb40cd8
Merge: ccab252 13778cd
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 14 09:30:06 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 09:30:06 2014 -0400
Merge topic 'cpack-deb-compression-types' into next
13778cd3 CPackDeb: Add option to set compression type
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13778cd3be03de966c006b7acc6c1ec07019ab07
commit 13778cd3be03de966c006b7acc6c1ec07019ab07
Author: Sean D'Epagnier s...@depagnier.com
AuthorDate: Mon Mar 10 13:37:26 2014 +0800
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 14 09:29:54 2014 -0400
CPackDeb: Add option to set compression type
Add a CPACK_DEBIAN_COMPRESSION_TYPE option to set the compression type.
Default to 'gzip' to preserve existing behavior. Use cmake -E tar
for 'gzip', 'bzip2', and 'none'. Use system tar for 'lzma' and 'xz'.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index c79ef06..b210bbb 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -67,7 +67,12 @@
# * Mandatory : YES
# * Default : 'devel'
#
-# The debian package section
+# .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE
+#
+# * Mandatory : YES
+# * Default : 'gzip'
+#
+# Possible values are: lzma, xz, bzip2 and gzip.
#
# .. variable:: CPACK_DEBIAN_PACKAGE_PRIORITY
#
@@ -390,6 +395,12 @@ if(NOT CPACK_DEBIAN_PACKAGE_PRIORITY)
set(CPACK_DEBIAN_PACKAGE_PRIORITY optional)
endif()
+# Compression: (recommended)
+if(NOT CPACK_DEBIAN_COMPRESSION_TYPE)
+ set(CPACK_DEBIAN_COMPRESSION_TYPE gzip)
+endif()
+
+
# Recommends:
# You should set: CPACK_DEBIAN_PACKAGE_RECOMMENDS
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 27e9d9f..936942b 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -403,9 +403,39 @@ int cmCPackDebGenerator::createDeb()
if (NULL != this-GetOption(CPACK_DEBIAN_FAKEROOT_EXECUTABLE)) {
cmd += this-GetOption(CPACK_DEBIAN_FAKEROOT_EXECUTABLE);
}
- cmd += \;
- cmd += cmakeExecutable;
- cmd += \ -E tar cfz data.tar.gz ;
+
+ const char* debian_compression_type =
+ this-GetOption(CPACK_DEBIAN_COMPRESSION_TYPE);
+ if(!debian_compression_type)
+{
+debian_compression_type = gzip;
+}
+
+ std::string cmake_tar = , compression_modifier = a, compression_suffix;
+ if(!strcmp(debian_compression_type, lzma)) {
+ compression_suffix = .lzma;
+ } else if(!strcmp(debian_compression_type, xz)) {
+ compression_suffix = .xz;
+ } else if(!strcmp(debian_compression_type, bzip2)) {
+ compression_suffix = .bz2;
+ compression_modifier = j;
+ cmake_tar += \ + std::string(cmakeExecutable) + \ -E ;
+ } else if(!strcmp(debian_compression_type, gzip)) {
+ compression_suffix = .gz;
+ compression_modifier = z;
+ cmake_tar += \ + std::string(cmakeExecutable) + \ -E ;
+ } else if(!strcmp(debian_compression_type, none)) {
+ compression_suffix = ;
+ compression_modifier = ;
+ cmake_tar += \ + std::string(cmakeExecutable) + \ -E ;
+ } else {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
+Error unrecognized compression type:
+ debian_compression_type std::endl);
+ }
+
+ cmd += cmake_tar + tar c + compression_modifier + f data.tar
+ + compression_suffix;
// now add all directories which have to be compressed
// collect all top level install dirs for that
@@ -493,9 +523,7 @@ int cmCPackDebGenerator::createDeb()
{
cmd = this-GetOption(CPACK_DEBIAN_FAKEROOT_EXECUTABLE);
}
-cmd += \;
-cmd += cmakeExecutable;
-cmd += \ -E tar cfz control.tar.gz ./control ./md5sums;
+cmd += cmake_tar + tar czf control.tar.gz ./control ./md5sums;
const char* controlExtra =
this-GetOption(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA);
if( controlExtra )
@@ -514,7 +542,7 @@ int cmCPackDebGenerator::createDeb()
if( cmsys::SystemTools::CopyFileIfDifferent(
i-c_str(), localcopy.c_str()) )
{
-// debian is picky and need relative to ./ path in the tar.gz
+// debian is picky and need relative to ./ path in
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-307-g67a0d5e
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 67a0d5e4c4c2b7379538bbc29f349c7fb2205947 (commit) via c34216cf8a265b617d4422d772187e38e57647ba (commit) from 92b423fc2f504c645405669ffa5659c2268c6445 (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=67a0d5e4c4c2b7379538bbc29f349c7fb2205947 commit 67a0d5e4c4c2b7379538bbc29f349c7fb2205947 Merge: 92b423f c34216c Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:30:26 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:30:26 2014 -0400 Merge topic 'unicode-cmake-gui' c34216cf cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding. --- Summary of changes: Source/QtDialog/CMakeSetup.cxx |2 -- 1 file changed, 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1034-gac6531b
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 ac6531b697148dbdcb2d3fcb02d706486a4716cd (commit) via dafa80ecc03eea8c75371e98e626679a3f96d5a9 (commit) via 76845bdbf4ad5e3272710d64ac763b5f28e37567 (commit) via 67a0d5e4c4c2b7379538bbc29f349c7fb2205947 (commit) via 92b423fc2f504c645405669ffa5659c2268c6445 (commit) via 32b7d2ed8a4286de5db18883b1db7cdc4f902598 (commit) via e623605ed6e7f4645c124e4ad3c07ef3e7a7682d (commit) from 50615522c7c89f26b9cd4b162a6e21690cb40cd8 (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=ac6531b697148dbdcb2d3fcb02d706486a4716cd commit ac6531b697148dbdcb2d3fcb02d706486a4716cd Merge: 5061552 dafa80e Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:31:34 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Mar 14 09:31:34 2014 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1038-gd11bfd8
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 d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4 (commit) via eddabf9fcf1783834dd7fdda335c54d08b44b0cc (commit) from 60fcf1396200c66aa3a37eb2547b9c0669b17411 (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=d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4 commit d11bfd80672d2c9bab6d3e18583c0cedccbbd5c4 Merge: 60fcf13 eddabf9 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:40:07 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:40:07 2014 -0400 Merge topic 'intel-14-version' into next eddabf9f CMake*CompilerId: Fix patch level for Intel = 14.0 (#14806) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eddabf9fcf1783834dd7fdda335c54d08b44b0cc commit eddabf9fcf1783834dd7fdda335c54d08b44b0cc Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 08:41:24 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Mar 14 08:51:37 2014 -0400 CMake*CompilerId: Fix patch level for Intel = 14.0 (#14806) According to the Intel release notes: http://software.intel.com/sites/default/files/l-compiler-release-update.pdf the __INTEL_COMPILER_UPDATE predefined macro was introduced to hold the third version component. Reported-by: Dirk Ribbrock dirk.ribbr...@mathematik.uni-dortmund.de Co-Author: Rolf Eike Beer k...@opensource.sf-tec.de diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 52f9590..561ccf2 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -14,7 +14,11 @@ /* __INTEL_COMPILER = VRP */ # define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) # define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) -# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER% 10) +# if defined(__INTEL_COMPILER_UPDATE) +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) +# else +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) +# endif # if defined(__INTEL_COMPILER_BUILD_DATE) /* __INTEL_COMPILER_BUILD_DATE = MMDD */ # define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 25ceb3f..6c602d4 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -19,7 +19,11 @@ /* __INTEL_COMPILER = VRP */ # define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) # define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) -# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER% 10) +# if defined(__INTEL_COMPILER_UPDATE) +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) +# else +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) +# endif # if defined(__INTEL_COMPILER_BUILD_DATE) /* __INTEL_COMPILER_BUILD_DATE = MMDD */ # define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) --- Summary of changes: Modules/CMakeCCompilerId.c.in |6 +- Modules/CMakeCXXCompilerId.cpp.in |6 +- 2 files changed, 10 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1036-g60fcf13
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 60fcf1396200c66aa3a37eb2547b9c0669b17411 (commit) via 16caa6ecba698e08cb1b2608aa479b7484cad73a (commit) from ac6531b697148dbdcb2d3fcb02d706486a4716cd (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=60fcf1396200c66aa3a37eb2547b9c0669b17411 commit 60fcf1396200c66aa3a37eb2547b9c0669b17411 Merge: ac6531b 16caa6e Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:39:58 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 09:39:58 2014 -0400 Merge topic 'cpack-deb-compression-types' into next 16caa6ec Help: Add release notes for topic 'cpack-deb-compression-types' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16caa6ecba698e08cb1b2608aa479b7484cad73a commit 16caa6ecba698e08cb1b2608aa479b7484cad73a Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 09:34:14 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Mar 14 09:34:14 2014 -0400 Help: Add release notes for topic 'cpack-deb-compression-types' diff --git a/Help/release/dev/cpack-deb-compression-types.rst b/Help/release/dev/cpack-deb-compression-types.rst new file mode 100644 index 000..a33e333 --- /dev/null +++ b/Help/release/dev/cpack-deb-compression-types.rst @@ -0,0 +1,6 @@ +cpack-deb-compression-types +--- + +* The :module:`CPackDeb` module learned a new + :variable:`CPACK_DEBIAN_COMPRESSION_TYPE` variable to set the + tarball compression type. --- Summary of changes: Help/release/dev/cpack-deb-compression-types.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/cpack-deb-compression-types.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1042-g4754b5c
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 4754b5c1d4c9d3f978297466d01187ed50a2e684 (commit)
via 4402551e623047323ca2c6901db6557de58e055f (commit)
from 56d6bd9e0d251f6c268f41647771e457bbc2729c (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=4754b5c1d4c9d3f978297466d01187ed50a2e684
commit 4754b5c1d4c9d3f978297466d01187ed50a2e684
Merge: 56d6bd9 4402551
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 09:59:01 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 09:59:01 2014 -0400
Merge topic 'unicode-vs-projects' into next
4402551e Encoding: Provide option to configure CMake to use UTF-8 encoding.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4402551e623047323ca2c6901db6557de58e055f
commit 4402551e623047323ca2c6901db6557de58e055f
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 07:54:21 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Mar 14 07:56:12 2014 -0600
Encoding: Provide option to configure CMake to use UTF-8 encoding.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f83015..b0793d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,13 @@ if(${CMake_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
endmacro()
endif()
+# option to set the internal encoding of CMake to UTF-8
+option(CMAKE_ENCODING_UTF8 Use UTF-8 encoding internally (experimental). OFF)
+mark_as_advanced(CMAKE_ENCODING_UTF8)
+if(CMAKE_ENCODING_UTF8)
+ set(KWSYS_ENCODING_DEFAULT_CODEPAGE CP_UTF8)
+endif()
+
#---
# a macro to deal with system libraries, implemented as a macro
# simply to improve readability of the main script
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 106cffc..9fb8d9a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -24,12 +24,6 @@ endif()
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
-# for windows, we can use the utf-8 code page for conversions
-# between wide and narrow strings
-if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
- set(CMAKE_ENCODING_UTF8 1)
-endif()
-
# ensure Unicode friendly APIs are used on Windows
if(WIN32)
add_definitions(-DUNICODE -D_UNICODE)
---
Summary of changes:
CMakeLists.txt|7 +++
Source/CMakeLists.txt |6 --
2 files changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1044-gc7ed80a
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 c7ed80a65fe6a6f6ff10044ed927238da0a0a3e2 (commit)
via 709eb1c17f60302b582a213a5e1999c2a4a8d6e2 (commit)
from 4754b5c1d4c9d3f978297466d01187ed50a2e684 (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=c7ed80a65fe6a6f6ff10044ed927238da0a0a3e2
commit c7ed80a65fe6a6f6ff10044ed927238da0a0a3e2
Merge: 4754b5c 709eb1c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 09:59:45 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 09:59:45 2014 -0400
Merge topic 'fix-Qt4-moc-commands-depends' into next
709eb1c1 Revert topic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=709eb1c17f60302b582a213a5e1999c2a4a8d6e2
commit 709eb1c17f60302b582a213a5e1999c2a4a8d6e2
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 14:58:57 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Mar 14 14:59:12 2014 +0100
Revert topic.
diff --git a/Help/command/add_custom_command.rst
b/Help/command/add_custom_command.rst
index 028ca5a..b0c5446 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -156,7 +156,3 @@ target is built before any target using this custom command.
Additionally, if the target is an executable or library a file-level
dependency is created to cause the custom command to re-run whenever
the target is recompiled.
-
-Arguments to ``DEPENDS`` may use generator expressions with the syntax
-``$...``. See the :manual:`cmake-generator-expressions(7)` manual for
-available expressions.
diff --git a/Help/release/dev/add_custom_command-DEPENDS-genex.rst
b/Help/release/dev/add_custom_command-DEPENDS-genex.rst
deleted file mode 100644
index 62f6f47..000
--- a/Help/release/dev/add_custom_command-DEPENDS-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add_custom_command-DEPENDS-genex
-
-
-* The :command:`add_custom_command` command learned to interpret
-:manual:`cmake-generator-expressions(7)` in arguments to ``DEPENDS``.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index aca8996..8baf896 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -141,7 +141,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags
moc_options moc_target)
set(_moc_extra_parameters_file @${_moc_parameters_file})
add_custom_command(OUTPUT ${outfile}
COMMAND Qt4::moc ${_moc_extra_parameters_file}
- DEPENDS ${infile} ${_moc_parameters_file}
+ DEPENDS ${infile}
${_moc_working_dir}
VERBATIM)
endmacro ()
diff --git a/Source/cmCustomCommandGenerator.cxx
b/Source/cmCustomCommandGenerator.cxx
index c359dda..a091cff 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -21,7 +21,7 @@ cmCustomCommandGenerator::cmCustomCommandGenerator(
cmCustomCommand const cc, const std::string config, cmMakefile* mf):
CC(cc), Config(config), Makefile(mf), LG(mf-GetLocalGenerator()),
OldStyle(cc.GetEscapeOldStyle()), MakeVars(cc.GetEscapeAllowMakeVars()),
- GE(new cmGeneratorExpression(cc.GetBacktrace())), DependsDone(false)
+ GE(new cmGeneratorExpression(cc.GetBacktrace()))
{
}
@@ -93,18 +93,5 @@ std::vectorstd::string const
cmCustomCommandGenerator::GetOutputs() const
//
std::vectorstd::string const cmCustomCommandGenerator::GetDepends() const
{
- if (!this-DependsDone)
-{
-this-DependsDone = true;
-std::vectorstd::string depends = this-CC.GetDepends();
-for(std::vectorstd::string::const_iterator
- i = depends.begin();
-i != depends.end(); ++i)
- {
- cmsys::auto_ptrcmCompiledGeneratorExpression cge = this-GE-Parse(*i);
- cmSystemTools::ExpandListArgument(
- cge-Evaluate(this-Makefile, this-Config), this-Depends);
- }
-}
- return this-Depends;
+ return this-CC.GetDepends();
}
diff --git a/Source/cmCustomCommandGenerator.h
b/Source/cmCustomCommandGenerator.h
index 0d8a0a4..cbcdb41 100644
--- a/Source/cmCustomCommandGenerator.h
+++ b/Source/cmCustomCommandGenerator.h
@@ -28,8 +28,6 @@ class cmCustomCommandGenerator
bool OldStyle;
bool MakeVars;
cmGeneratorExpression* GE;
- mutable bool DependsDone;
- mutable std::vectorstd::string Depends;
public:
cmCustomCommandGenerator(cmCustomCommand const cc,
const std::string config,
diff --git
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-314-g3d89b36
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 3d89b364154b803e6d8c6e70a427325a829e7b5c (commit) via 3a7501d9eb7e1a22a8c4161c88008c7929451554 (commit) via 9840320dff7d6bc0fc64d06271a639303ea53ce7 (commit) from dafa80ecc03eea8c75371e98e626679a3f96d5a9 (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=3d89b364154b803e6d8c6e70a427325a829e7b5c commit 3d89b364154b803e6d8c6e70a427325a829e7b5c Merge: dafa80e 3a7501d Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 10:35:42 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 10:35:42 2014 -0400 Merge topic 'ctest-intel-coverage' 3a7501d9 Help: Add release notes for topic 'ctest-intel-coverage' 9840320d CTest: Add support for Intel coverage files --- Summary of changes: Help/release/dev/ctest-intel-coverage.rst |5 + Source/CTest/cmCTestCoverageHandler.cxx | 305 + Source/CTest/cmCTestCoverageHandler.h |4 + 3 files changed, 314 insertions(+) create mode 100644 Help/release/dev/ctest-intel-coverage.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1046-g6a4ca08
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 6a4ca083f4547688614ec8b003bcf0ca3f04af9f (commit)
via d537ba304353ebdb504d7bf054e06815d04ff19b (commit)
from c7ed80a65fe6a6f6ff10044ed927238da0a0a3e2 (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=6a4ca083f4547688614ec8b003bcf0ca3f04af9f
commit 6a4ca083f4547688614ec8b003bcf0ca3f04af9f
Merge: c7ed80a d537ba3
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 10:35:31 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 10:35:31 2014 -0400
Merge topic 'fix-Qt5-windows-build' into next
d537ba30 Simplify logic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d537ba304353ebdb504d7bf054e06815d04ff19b
commit d537ba304353ebdb504d7bf054e06815d04ff19b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 15:33:49 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Mar 14 15:34:30 2014 +0100
Simplify logic.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 2abfb99..f5ddc0a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -38,7 +38,9 @@ if (Qt5Widgets_FOUND)
get_filename_component(Qt_BIN_DIR ${_Qt5_Core_LOCATION} PATH)
endif()
- set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+ if (NOT POLICY CMP0020)
+set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+ endif()
else()
set(QT_MIN_VERSION 4.4.0)
@@ -117,10 +119,7 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-target_link_libraries(cmake-gui CMakeLib ${CMake_QT_LIBRARIES})
-if (NOT Qt5Widgets_FOUND OR NOT POLICY CMP0020)
- target_link_libraries(cmake-gui ${QT_QTMAIN_LIBRARY})
-endif()
+target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY}
${CMake_QT_LIBRARIES})
if(Qt_BIN_DIR)
set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
endif()
---
Summary of changes:
Source/QtDialog/CMakeLists.txt |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1048-g31ce5e5
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 31ce5e58a47e5fc87be0ee7a997730e3fe404946 (commit) via 3a7501d9eb7e1a22a8c4161c88008c7929451554 (commit) from 6a4ca083f4547688614ec8b003bcf0ca3f04af9f (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=31ce5e58a47e5fc87be0ee7a997730e3fe404946 commit 31ce5e58a47e5fc87be0ee7a997730e3fe404946 Merge: 6a4ca08 3a7501d Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 10:35:38 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 10:35:38 2014 -0400 Merge topic 'ctest-intel-coverage' into next 3a7501d9 Help: Add release notes for topic 'ctest-intel-coverage' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a7501d9eb7e1a22a8c4161c88008c7929451554 commit 3a7501d9eb7e1a22a8c4161c88008c7929451554 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 10:31:30 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Mar 14 10:31:30 2014 -0400 Help: Add release notes for topic 'ctest-intel-coverage' diff --git a/Help/release/dev/ctest-intel-coverage.rst b/Help/release/dev/ctest-intel-coverage.rst new file mode 100644 index 000..11455a5 --- /dev/null +++ b/Help/release/dev/ctest-intel-coverage.rst @@ -0,0 +1,5 @@ +ctest-intel-coverage + + +* The :command:`ctest_coverage` command learned to support + Intel coverage files with the ``codecov`` tool. --- Summary of changes: Help/release/dev/ctest-intel-coverage.rst |5 + 1 file changed, 5 insertions(+) create mode 100644 Help/release/dev/ctest-intel-coverage.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-316-g7fba455
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 7fba4552fcbfb3d38c3467744e67dbf88c6b2936 (commit) via 16caa6ecba698e08cb1b2608aa479b7484cad73a (commit) from 3d89b364154b803e6d8c6e70a427325a829e7b5c (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=7fba4552fcbfb3d38c3467744e67dbf88c6b2936 commit 7fba4552fcbfb3d38c3467744e67dbf88c6b2936 Merge: 3d89b36 16caa6e Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 10:36:05 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 10:36:05 2014 -0400 Merge topic 'cpack-deb-compression-types' 16caa6ec Help: Add release notes for topic 'cpack-deb-compression-types' --- Summary of changes: Help/release/dev/cpack-deb-compression-types.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/cpack-deb-compression-types.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1051-geaa4695
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 eaa4695a676d1656a85579f2708b9fa3a8c86372 (commit) via 7fba4552fcbfb3d38c3467744e67dbf88c6b2936 (commit) via 3d89b364154b803e6d8c6e70a427325a829e7b5c (commit) from 31ce5e58a47e5fc87be0ee7a997730e3fe404946 (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=eaa4695a676d1656a85579f2708b9fa3a8c86372 commit eaa4695a676d1656a85579f2708b9fa3a8c86372 Merge: 31ce5e5 7fba455 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 14 10:36:57 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Mar 14 10:36:57 2014 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1058-g1d819f6
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 1d819f671b120b8de999f09d6e5f7221683eb3c5 (commit)
via ee8cef8725486519a7ab47eb16208d4d64e0ab99 (commit)
via 91fd99b86532dbf35d8c7396654b9beac058c8f3 (commit)
from 0aa4b514038de1f4129b79593173086264481f2b (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=1d819f671b120b8de999f09d6e5f7221683eb3c5
commit 1d819f671b120b8de999f09d6e5f7221683eb3c5
Merge: 0aa4b51 ee8cef8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 10:49:30 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 10:49:30 2014 -0400
Merge topic 'unicode-vs-projects' into next
ee8cef87 Encoding: If configured, write Visual Studio project files as
UTF-8.
91fd99b8 Encoding: Provide option to configure CMake to use UTF-8 encoding.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee8cef8725486519a7ab47eb16208d4d64e0ab99
commit ee8cef8725486519a7ab47eb16208d4d64e0ab99
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 08:48:42 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Mar 14 08:48:42 2014 -0600
Encoding: If configured, write Visual Studio project files as UTF-8.
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index 320b440..42033c5 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -873,7 +873,8 @@ cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget
const* target)
std::string guid = this-GetGUID(pname.c_str());
fout
-?xml version=\1.0\ encoding = \Windows-1252\?\n
+?xml version=\1.0\ encoding = \
+ this-Encoding() \?\n
VisualStudioProject\n
\tProjectType=\Visual C++\\n
\tVersion=\ this-GetIDEVersion() 0\\n
@@ -1038,3 +1039,14 @@ cmIDEFlagTable const*
cmGlobalVisualStudio7Generator::GetExtraFlagTableVS7()
{
return cmVS7ExtraFlagTable;
}
+
+std::string cmGlobalVisualStudio7Generator::Encoding()
+{
+ std::ostringstream encoding;
+#ifdef CMAKE_ENCODING_UTF8
+ encoding UTF-8;
+#else
+ encoding Windows-1252;
+#endif
+ return encoding.str();
+}
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index 0d2e410..1dc709d 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -109,6 +109,9 @@ public:
virtual void FindMakeProgram(cmMakefile*);
+ // Encoding for Visual Studio files
+ virtual std::string Encoding();
+
protected:
virtual const char* GetIDEVersion() { return 7.0; }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 69c893c..2b2a471 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -1,3 +1,4 @@
+
/*
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
@@ -918,4 +919,4 @@ std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
i += config.size();
}
return tmp;
-}
+}
\ No newline at end of file
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 14ad567..52524aa 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1975,7 +1975,8 @@ cmLocalVisualStudio7Generator
cmGlobalVisualStudio7Generator* gg =
static_castcmGlobalVisualStudio7Generator *(this-GlobalGenerator);
- fout ?xml version=\1.0\ encoding = \Windows-1252\?\n
+ fout ?xml version=\1.0\ encoding = \
+gg-Encoding() \?\n
VisualStudioProject\n
\tProjectCreator=\Intel Fortran\\n
\tVersion=\ gg-GetIntelProjectVersion() \\n;
@@ -2038,7 +2039,12 @@
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream fout,
this-WriteProjectStartFortran(fout, libName, target);
return;
}
- fout ?xml version=\1.0\ encoding = \Windows-1252\?\n
+
+ cmGlobalVisualStudio7Generator* gg =
+static_castcmGlobalVisualStudio7Generator *(this-GlobalGenerator);
+
+ fout ?xml version=\1.0\ encoding = \
+gg-Encoding() \?\n
VisualStudioProject\n
\tProjectType=\Visual C++\\n;
if(this-Version == VS71)
@@ -2059,8 +2065,6 @@
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream fout,
{
keyword = Win32Proj;
}
- cmGlobalVisualStudio7Generator* gg =
-
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1055-g0aa4b51
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 0aa4b514038de1f4129b79593173086264481f2b (commit)
via ca92ba8273cc2927ce0ee5b9c373f0cb56e5e155 (commit)
via 1ec5f686ee1072e12941fe3dbb47ab0248fb8f63 (commit)
via 67dd2c6f3d9250e5089fec0f1289ae6315ec4715 (commit)
from eaa4695a676d1656a85579f2708b9fa3a8c86372 (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=0aa4b514038de1f4129b79593173086264481f2b
commit 0aa4b514038de1f4129b79593173086264481f2b
Merge: eaa4695 ca92ba8
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 10:49:23 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 10:49:23 2014 -0400
Merge topic 'target-objects-refactor' into next
ca92ba82 cmGeneratorTarget: Compute target objects on demand
1ec5f686 cmGeneratorTarget: Don't store ObjectSources for object libraries.
67dd2c6f cmGlobalGenerator: Make ComputeTargetObjects non-virtual
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca92ba8273cc2927ce0ee5b9c373f0cb56e5e155
commit ca92ba8273cc2927ce0ee5b9c373f0cb56e5e155
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 13:21:26 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Mar 14 15:44:49 2014 +0100
cmGeneratorTarget: Compute target objects on demand
Add a ComputeTargetObjects method to compute the object
names. It takes mapping to populate as an out-parameter so
that it can be extended in the future with parameters
relevant to generator expression evaluation.
Remove the supporting cmGeneratorTarget::AddObject method. It is
no longer needed as the container member is populated directly.
In a follow-up, the UseObjectLibraries usage may be replaced by a
true generator expression evaluator for TARGET_OBJECTS. That
will require generators to use cmGeneratorTarget::GetExternalObjects
which is not currently the case for Xcode and VS generators.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2a144c6..92504e9 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -286,7 +286,6 @@ static void handleSystemIncludesDep(cmMakefile *mf,
cmTarget* depTgt,
}
#define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE) \
- { \
std::vectorcmSourceFile* sourceFiles; \
this-Target-GetSourceFiles(sourceFiles); \
TagVisitorDATA ## Tag DATATYPE visitor(this-Target, data); \
@@ -295,7 +294,6 @@ static void handleSystemIncludesDep(cmMakefile *mf,
cmTarget* depTgt,
{ \
visitor.Accept(*si); \
} \
- } \
#define IMPLEMENT_VISIT(DATA) \
@@ -310,18 +308,32 @@ cmGeneratorTarget
::GetObjectSources(std::vectorcmSourceFile const* data) const
{
IMPLEMENT_VISIT(ObjectSources);
+
+ if (!this-Objects.empty())
+{
+return;
+}
+
+ for(std::vectorcmSourceFile const*::const_iterator it = data.begin();
+ it != data.end(); ++it)
+{
+this-Objects[*it];
+}
+
+ this-LocalGenerator-ComputeObjectFilenames(this-Objects, this);
}
-//
-const std::string cmGeneratorTarget::GetObjectName(cmSourceFile const* file)
+void cmGeneratorTarget::ComputeObjectMapping()
{
- return this-Objects[file];
+ std::vectorcmSourceFile const* sourceFiles;
+ this-GetObjectSources(sourceFiles);
}
-void cmGeneratorTarget::AddObject(cmSourceFile const* sf,
- std::string constname)
+//
+const std::string cmGeneratorTarget::GetObjectName(cmSourceFile const* file)
{
-this-Objects[sf] = name;
+ this-ComputeObjectMapping();
+ return this-Objects[file];
}
//
@@ -573,6 +585,9 @@
cmGeneratorTarget::UseObjectLibraries(std::vectorstd::string objs) const
cmTarget* objLib = *ti;
cmGeneratorTarget* ogt =
this-GlobalGenerator-GetGeneratorTarget(objLib);
+
+ogt-ComputeObjectMapping();
+
std::vectorcmSourceFile const* objectSources;
ogt-GetObjectSources(objectSources);
for(std::vectorcmSourceFile const*::const_iterator
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 53e27c5..22735c6 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -35,7 +35,6 @@ public:
void GetObjectSources(std::vectorcmSourceFile const* ) const;
const std::string GetObjectName(cmSourceFile const* file);
- void AddObject(cmSourceFile
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1060-g8da0919
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 8da0919bad430951b01b953b649ef640e65ad4cb (commit)
via c16b481c470dbc83fb75cd59065f5ac8e805993b (commit)
from 1d819f671b120b8de999f09d6e5f7221683eb3c5 (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=8da0919bad430951b01b953b649ef640e65ad4cb
commit 8da0919bad430951b01b953b649ef640e65ad4cb
Merge: 1d819f6 c16b481
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 11:00:51 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 11:00:51 2014 -0400
Merge topic 'target-objects-refactor' into next
c16b481c Remove unnecessary change.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c16b481c470dbc83fb75cd59065f5ac8e805993b
commit c16b481c470dbc83fb75cd59065f5ac8e805993b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Mar 14 15:59:01 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Mar 14 15:59:01 2014 +0100
Remove unnecessary change.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 92504e9..e909418 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -286,6 +286,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
cmTarget* depTgt,
}
#define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE) \
+ { \
std::vectorcmSourceFile* sourceFiles; \
this-Target-GetSourceFiles(sourceFiles); \
TagVisitorDATA ## Tag DATATYPE visitor(this-Target, data); \
@@ -294,6 +295,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
cmTarget* depTgt,
{ \
visitor.Accept(*si); \
} \
+ } \
#define IMPLEMENT_VISIT(DATA) \
---
Summary of changes:
Source/cmGeneratorTarget.cxx |2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
