[cmake-developers] [CMake 0014462]: RELATIVE_PATH does not return a relative path when there is a double slash in the original path
The following issue has been SUBMITTED.
==
http://public.kitware.com/Bug/view.php?id=14462
==
Reported By:Ronan Collobert
Assigned To:
==
Project:CMake
Issue ID: 14462
Category: CMake
Reproducibility:always
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2013-10-08 03:10 EDT
Last Modified: 2013-10-08 03:10 EDT
==
Summary:RELATIVE_PATH does not return a relative path when
there is a double slash in the original path
Description:
Assuming:
SET(PATH1 /foo/bar)
SET(PATH2 /foo/bar//aaa/bbb)
FILE(RELATIVE_PATH RELPATH12 ${PATH1} ${PATH2})
MESSAGE(RELATIVE PATH: ${RELPATH12})
This will print:
RELATIVE PATH: /aaa/bbb
Which is *not* a relative path in any ways (it should have been aaa/bbb). It
is common that there are extra / in paths (often occurring when two paths are
concatenated), and CMake should not take in account those ones.
==
Issue History
Date ModifiedUsername FieldChange
==
2013-10-08 03:10 Ronan CollobertNew Issue
==
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014463]: Linking fails with a gcc build with compound circular library dependencies.
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14463 == Reported By:John Szwast Assigned To: == Project:CMake Issue ID: 14463 Category: (No Category) Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2013-10-08 12:15 EDT Last Modified: 2013-10-08 12:15 EDT == Summary:Linking fails with a gcc build with compound circular library dependencies. Description: On a project with a library dependency cycle and a strict path of dependency, linking with gcc fails. Steps to Reproduce: Attempt to build the attached example project with gcc. The linker error will be of the form: c\libc.a(c.obj):c.c:(.text+0xd): undefined reference to `do_b' collect2.exe: error: ld returned 1 exit status CMakeFiles\demo.dir\build.make:97: recipe for target 'demo.exe' failed mingw32-make[2]: *** [demo.exe] Error 1 CMakeFiles\Makefile2:62: recipe for target 'CMakeFiles/demo.dir/all' failed mingw32-make[1]: *** [CMakeFiles/demo.dir/all] Error 2 Makefile:74: recipe for target 'all' failed mingw32-make: *** [all] Error 2 Additional Information: I've encountered this with each of the following setups: Windows 7 64-bit with CMake 2.8.11.2 using MinGW Makefiles generator. Windows 7 64-bit with CMake 2.8.11.2 using Ninja generator. Linux Mint 64-bit with CMake 2.8.9 using the default (Unix Makefiles) generator. Each CMakeLists.txt file in the example project accurately specifies the libraries' dependencies with target_link_libraries() statements. c -- b ^ | | v demo -- d -- a ^ | | | +-+ The generated link command lists each pair of dependent libraries in the required order, but the whole dependency path of d - c - b - a is not realized in the linker's library list order: c:\MinGW\bin\gcc.exe -Wl,--whole-archive CMakeFiles\demo.dir/objects.a -Wl,--no-whole-archive -o demo.exe -Wl,--out-implib,libdemo.dll.a -Wl,--major-image-version,0,--minor-image-version,0 a\liba.a b\libb.a c\libc.a d\libd.a a\liba.a b\libb.a c\libc.a d\libd.a -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 So the parts of library a that are only used by b and not d are not available. And the part of b that does use library a isn't even getting linked in because the part of library c that uses it wasn't linked in yet when b's turn came around. == Issue History Date ModifiedUsername FieldChange == 2013-10-08 12:15 John SzwastNew Issue 2013-10-08 12:15 John SzwastFile Added: CMake MinGW MWE.zip == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Suspicious Clang versions
On 08/06/2013 09:19 AM, Brad King wrote: On second thought adding yet another dimension to the compiler identification is just more complexity. We can use a separate compiler id for each variant and simply have the platform information modules for each vendor include the upstream one. I've resolved this with a new AppleClang compiler id: Clang: Add separate AppleClang compiler id http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab658624 and a policy for compatibility with project code expecting the old id for the compiler: Add policy CMP0025 for Apple Clang compiler id compatibility http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa53ee57 -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] CMake 2.8.12 Released!
On behalf of myself, Ken, Bill, Brad, David, Alex, Eike, Steve, Eric, Zach, Ben and the rest of the CMake team from all around the world, we are pleased to announce that CMake 2.8.12 is now available for download at: http://www.cmake.org/files/v2.8/?C=M;O=D It is also available from the usual download links found on the CMake web site: http://www.cmake.org/cmake/resources/software.html We would like to thank the CMake users who reported issues during the CMake 2.8.12 release cycle. Your contributions are greatly appreciated. Some of the notable changes in this release are: - Introduced target_compile_options command - Specify compile options to use when compiling a given target. Supports PUBLIC, PRIVATE, and INTERFACE options. PRIVATE and PUBLIC items will populate the COMPILE_OPTIONS property of the target. PUBLIC and INTERFACE items will populate the INTERFACE_COMPILE_OPTIONS property of the target. Supports generator expressions. - Introduced add_compile_options command - Adds options to the compiler command line for sources in the current directory and below. Supports generator expressions. - Introduced CMake Policy CMP0021: - It is now an error to add relative paths to the INCLUDE_DIRECTORIES target property. - Introduced CMake Policy CMP0022: - Target properties matching (IMPORTED_)LINK_INTERFACE_LIBRARIES(_CONFIG) are ignored, and will no longer be populated by the target_link_libraries command. It is now an error to populate the properties directly in user code. Instead use the INTERFACE keyword with target_link_libraries, or the target property INTERFACE_LINK_LIBRARIES. - Introduced CMake Policy CMP0023: - Plain and keyword target_link_libraries signatures cannot be mixed for a given target when this policy is enabled. Once PUBLIC,PRIVATE, or INTERFACE keywords are used, all subsequent target_link_libraries calls to the target must use one of these keywords. - Introduced: Support for RPATH under OSX - Please see the blog post by Clinton Stimpson about using RPATH on OSX (http://www.kitware.com/blog/home/post/510) - CMake: New PUBLIC PRIVATE and INTERFACE options for target_link_libraries - CMake: New ALIAS targets feature - CMake: Automatically process Headers directory of Apple Frameworks as a usage requirement - CMake: File command now supports the GENERATE command to produce files at generate time - CMake: target_include_directories now supports the SYSTEM parameter - CMake: Add support for Java in cross compilation toolchains - CMake: Improved support for the IAR toolchain - CMake: Improved support for the ARM toolchain under Visual Studio - CMake: Improvements to the Visual Studio Generators Including - Separate compiler and linker PDB files - Support for subdirectory MSBuild projects - Support for assembly code to VS10 - Support for Windows CE to VS11 - CMake: Added COMPILE_OPTIONS target property. - CMake: Added INTERFACE_LINK_LIBRARIES added as a property to targets - CMake: Now supports .zip files with the tar command - CMake: try_compile now supports multiple source files - CMake: Optimized custom command dependency lookup - CMake: Removal of configured files will retrigger CMake when issuing a build command - CMake: Ninja now tracks custom command generated files that aren't listed as output - CMake: Added generator expression support for compiler versions - CMake: Added support for XCode 5.0 - CMake-Gui: Add search functions for Output window - CTest: Improved memory checker support - FindGTK2: General Improvements - FindCUDA: Multiple improvements to the custom commands The bug tracker change log page for this version is at: http://public.kitware.com/Bug/changelog_page.php?version_id=112 The complete list of changes for this release can be found at: http://www.cmake.org/Wiki/CMake/ChangeLog Thanks -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014464]: Function name with a single letter doesn't work
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14464 == Reported By:James Bigler Assigned To: == Project:CMake Issue ID: 14464 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2013-10-08 15:03 EDT Last Modified: 2013-10-08 15:03 EDT == Summary:Function name with a single letter doesn't work Description: Given the following cmake code: function(x) message(hi) endfunction() x() CMake will produce this error: Parse error. Expected a command name, got unquoted argument with text x. If you change the function to have more than one character, then it works properly: function(xx) message(hi) endfunction() xx() Additional Information: Seems to affect version 2.8.10.1, but I haven't tried other versions. == Issue History Date ModifiedUsername FieldChange == 2013-10-08 15:03 James Bigler New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] FLAGS on Darwin and custom rules in 2.8.11
Hello, I noticed that in 2.8.11 under OSX CMake adds -F/Library/Frameworks in every kind of FLAGS rule, for any language. This of course conflicts with non C/C++ compilers (I don't know about fortran) and my Pascal based build system breaks because -F is not a freepascal flag. How can I prevent this from happening? I tried thinking about some smart parsing but since it is added in the last position of FLAGS there is little I can do. My custom rule file is here: https://code.google.com/p/hedgewars/source/browse/cmake_modules/CMakePascalInformation.cmake Any help is appreciated. Vittorio -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [CMake] unset(PARENT_SCOPE)
On 09/17/2013 02:00 PM, James Bigler wrote: If there is a set(PARENT_SCOPE) why isn't there an unset(PARENT_SCOPE)? It seems like a hole in the API. Yes, I'll look at adding it. You should be able to use set(var PARENT_SCOPE) to unset. The unset command is mostly a readability convenience. -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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Problem using VS 2012 Express and CMake
The VisualStudio12 Generator file is for Visual Studio 2013. CMake numbers the Visual Studio Generators based on MSC_VER number, not the year in the products name. On Mon, Oct 7, 2013 at 10:13 PM, Doug douglas.lin...@gmail.com wrote: Interesting that it works for you. Are you definitely using VS2012, not the VS2013 release candidate? I believe the issue I'm experiencing is related to: http://public.kitware.com/Bug/view.php?id=14369 http://msdn.microsoft.com/en-us/library/vstudio/hh162058%28v=vs.120%29.aspx Ie. In VS2013 the tools version changes from 4.0 as msbuild is moved out of the framework. However, I believe that this has mistakenly been put in the VS2012 generator, when it should go in a new VS2013 generator. ~ Doug. On Mon, Oct 7, 2013 at 9:01 PM, Michael Jackson mike.jack...@bluequartz.net wrote: I am running CMake 2.8.10.1 on Windows 7 x64 (inside a VM) and have Visual Studio 2012 Express installed (SP2 level) and I can definitely configure my project with CMake, open the solution file and build with VS express. Possibly the differentiating factor is that I also installed the Windows Software Development Kit so that I could also use QtCreator BUT maybe this allowed VS Express to work correctly with CMake? Just another data point. ___ Mike JacksonPrincipal Software Engineer BlueQuartz SoftwareDayton, Ohio mike.jack...@bluequartz.net www.bluequartz.net On Oct 7, 2013, at 8:46 AM, Doug douglas.lin...@gmail.com wrote: Oh, thank you~ I was just trying the nightly builds in the hopes that they had a fix with no luck, but you're right, generating a VS2011 project did work. The 2012 generator is still broken in the nightlies, both for pro and express though as far as I can tell. ~ Doug. On Mon, Oct 7, 2013 at 1:35 PM, Daniel S. Reichenbach dan...@kogitoapp.com wrote: Hi, Anyway, long story short: I'm fairly certain that its currently not possible to build cmake projects with visual studio express 2012 on windows 7. Use CMake 2.8.11 and it will work, there seems to be a fix in there. Had to use the VS2011 generator but it works. Test in a Windows 7 x64 virtual machine with CMake 2.8.11 and Visual Studio Express 2012 for Windows desktop. WkR, Daniel -- 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 -- 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 -- Powered by www.kitware.com Please keep messages
[CMake] CMake 2.8.12 Released!
On behalf of myself, Ken, Bill, Brad, David, Alex, Eike, Steve, Eric, Zach, Ben and the rest of the CMake team from all around the world, we are pleased to announce that CMake 2.8.12 is now available for download at: http://www.cmake.org/files/v2.8/?C=M;O=D It is also available from the usual download links found on the CMake web site: http://www.cmake.org/cmake/resources/software.html We would like to thank the CMake users who reported issues during the CMake 2.8.12 release cycle. Your contributions are greatly appreciated. Some of the notable changes in this release are: - Introduced target_compile_options command - Specify compile options to use when compiling a given target. Supports PUBLIC, PRIVATE, and INTERFACE options. PRIVATE and PUBLIC items will populate the COMPILE_OPTIONS property of the target. PUBLIC and INTERFACE items will populate the INTERFACE_COMPILE_OPTIONS property of the target. Supports generator expressions. - Introduced add_compile_options command - Adds options to the compiler command line for sources in the current directory and below. Supports generator expressions. - Introduced CMake Policy CMP0021: - It is now an error to add relative paths to the INCLUDE_DIRECTORIES target property. - Introduced CMake Policy CMP0022: - Target properties matching (IMPORTED_)LINK_INTERFACE_LIBRARIES(_CONFIG) are ignored, and will no longer be populated by the target_link_libraries command. It is now an error to populate the properties directly in user code. Instead use the INTERFACE keyword with target_link_libraries, or the target property INTERFACE_LINK_LIBRARIES. - Introduced CMake Policy CMP0023: - Plain and keyword target_link_libraries signatures cannot be mixed for a given target when this policy is enabled. Once PUBLIC,PRIVATE, or INTERFACE keywords are used, all subsequent target_link_libraries calls to the target must use one of these keywords. - Introduced: Support for RPATH under OSX - Please see the blog post by Clinton Stimpson about using RPATH on OSX (http://www.kitware.com/blog/home/post/510) - CMake: New PUBLIC PRIVATE and INTERFACE options for target_link_libraries - CMake: New ALIAS targets feature - CMake: Automatically process Headers directory of Apple Frameworks as a usage requirement - CMake: File command now supports the GENERATE command to produce files at generate time - CMake: target_include_directories now supports the SYSTEM parameter - CMake: Add support for Java in cross compilation toolchains - CMake: Improved support for the IAR toolchain - CMake: Improved support for the ARM toolchain under Visual Studio - CMake: Improvements to the Visual Studio Generators Including - Separate compiler and linker PDB files - Support for subdirectory MSBuild projects - Support for assembly code to VS10 - Support for Windows CE to VS11 - CMake: Added COMPILE_OPTIONS target property. - CMake: Added INTERFACE_LINK_LIBRARIES added as a property to targets - CMake: Now supports .zip files with the tar command - CMake: try_compile now supports multiple source files - CMake: Optimized custom command dependency lookup - CMake: Removal of configured files will retrigger CMake when issuing a build command - CMake: Ninja now tracks custom command generated files that aren't listed as output - CMake: Added generator expression support for compiler versions - CMake: Added support for XCode 5.0 - CMake-Gui: Add search functions for Output window - CTest: Improved memory checker support - FindGTK2: General Improvements - FindCUDA: Multiple improvements to the custom commands The bug tracker change log page for this version is at: http://public.kitware.com/Bug/changelog_page.php?version_id=112 The complete list of changes for this release can be found at: http://www.cmake.org/Wiki/CMake/ChangeLog 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
[CMake] Xcode option to attribute
The MSVC generators will convert additions to the compiler flags into project settings that are visible in their normal GUI project editor location rather than the Additional Command Line Option area. It would be great if the Xcode generator would do this also. CONFIDENTIAL: This e-mail including any attachments is intended only for the party or parties to whom it is addressed and may contain information which is privileged and/or confidential. If you are not the intended recipient, you are hereby notified that any use, disclosure, dissemination, distribution, copying, or printing of any information contained in or attached to this e-mail is STRICTLY PROHIBITED and may constitute a breach of confidentiality and/or privilege. If you have received this e-mail in error, please notify immediately the sender by reply e-mail and then delete this e-mail and any attachments in their entirety from your system. Thank you. This e-mail message including any attachments is believed to be free of any viruses; however, it is the sole responsibility of the recipient to ensure that it is virus free, and Nikon does not accept any responsibility for any loss, disruption or damage to your data or computer system which may occur in connection with this e-mail including any attachments. [http://download2.nikon.net/images/logo/bsymbol.gif] Khouri Giordano Software Technology Researcher Nikon Inc. 1300 Walt Whitman Road Melville NY 11747-3064 Office: 631-547-4335Fax: 631-547-0361 kgiord...@nikon.netmailto:kgiord...@nikon.net www.nikonusa.com -- 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] Xcode settings
Why is there no way to default certain Xcode settings like ARCHS? If I unset CMAKE_OSX_ARCHITECTURES or set it to an empty string, I get an override of 32 and 64-bit instead of no setting which would use the default of 64-bit only. CONFIDENTIAL: This e-mail including any attachments is intended only for the party or parties to whom it is addressed and may contain information which is privileged and/or confidential. If you are not the intended recipient, you are hereby notified that any use, disclosure, dissemination, distribution, copying, or printing of any information contained in or attached to this e-mail is STRICTLY PROHIBITED and may constitute a breach of confidentiality and/or privilege. If you have received this e-mail in error, please notify immediately the sender by reply e-mail and then delete this e-mail and any attachments in their entirety from your system. Thank you. This e-mail message including any attachments is believed to be free of any viruses; however, it is the sole responsibility of the recipient to ensure that it is virus free, and Nikon does not accept any responsibility for any loss, disruption or damage to your data or computer system which may occur in connection with this e-mail including any attachments. [http://download2.nikon.net/images/logo/bsymbol.gif] Khouri Giordano Software Technology Researcher Nikon Inc. 1300 Walt Whitman Road Melville NY 11747-3064 Office: 631-547-4335Fax: 631-547-0361 kgiord...@nikon.netmailto:kgiord...@nikon.net www.nikonusa.com -- 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] Problem using VS 2012 Express and CMake
Has anyone been able to get the newest cmake release (2.8.11.2) working with Visual Studio 2013 Express RC? I've been trying yet cmake cannot identify the C/CXX compilers, The CXX compiler identification is unknown. Anyone have any suggestions? On Tue, Oct 8, 2013 at 6:37 AM, Robert Maynard robert.mayn...@kitware.comwrote: The VisualStudio12 Generator file is for Visual Studio 2013. CMake numbers the Visual Studio Generators based on MSC_VER number, not the year in the products name. On Mon, Oct 7, 2013 at 10:13 PM, Doug douglas.lin...@gmail.com wrote: Interesting that it works for you. Are you definitely using VS2012, not the VS2013 release candidate? I believe the issue I'm experiencing is related to: http://public.kitware.com/Bug/view.php?id=14369 http://msdn.microsoft.com/en-us/library/vstudio/hh162058%28v=vs.120%29.aspx Ie. In VS2013 the tools version changes from 4.0 as msbuild is moved out of the framework. However, I believe that this has mistakenly been put in the VS2012 generator, when it should go in a new VS2013 generator. ~ Doug. On Mon, Oct 7, 2013 at 9:01 PM, Michael Jackson mike.jack...@bluequartz.net wrote: I am running CMake 2.8.10.1 on Windows 7 x64 (inside a VM) and have Visual Studio 2012 Express installed (SP2 level) and I can definitely configure my project with CMake, open the solution file and build with VS express. Possibly the differentiating factor is that I also installed the Windows Software Development Kit so that I could also use QtCreator BUT maybe this allowed VS Express to work correctly with CMake? Just another data point. ___ Mike JacksonPrincipal Software Engineer BlueQuartz SoftwareDayton, Ohio mike.jack...@bluequartz.net www.bluequartz.net On Oct 7, 2013, at 8:46 AM, Doug douglas.lin...@gmail.com wrote: Oh, thank you~ I was just trying the nightly builds in the hopes that they had a fix with no luck, but you're right, generating a VS2011 project did work. The 2012 generator is still broken in the nightlies, both for pro and express though as far as I can tell. ~ Doug. On Mon, Oct 7, 2013 at 1:35 PM, Daniel S. Reichenbach dan...@kogitoapp.com wrote: Hi, Anyway, long story short: I'm fairly certain that its currently not possible to build cmake projects with visual studio express 2012 on windows 7. Use CMake 2.8.11 and it will work, there seems to be a fix in there. Had to use the VS2011 generator but it works. Test in a Windows 7 x64 virtual machine with CMake 2.8.11 and Visual Studio Express 2012 for Windows desktop. WkR, Daniel -- 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 -- 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
Re: [CMake] How to write a correct wrapper of MESSAGE()?
On Sat, Oct 5, 2013 at 1:38 AM, Matthew Woehlke matthew.woeh...@kitware.com
wrote:
On 2013-09-27 04:18, Clark WANG wrote:
I'm trying to write some MESSAGE() wrappers like info(), warning(),
fatal(), etc which may be a bit easier to use. But I failed to simulate
the
correct MESSAGE() behavior no matter I use MACRO or FUNCTION. For example:
[snip]
FUNCTION vs MACRO shouldn't make a difference in argument parsing AFAIK.
The difference is primarily that FUNCTION creates a scope, while MACRO
operates in the scope from which it is called.
The behavior of MESSAGE seems to concatenate multiple arguments with no
separators. So maybe you could do something like:
set(msg )
foreach(part IN LISTS ARGN)
set(msg ${msg}{$part})
endforeach()
# ...do stuff with ${msg}
This does not work either. For example:
$ cat CMakeLists.txt
cmake_minimum_required(VERSION 2.8)
FUNCTION(info_f)
set(msg )
foreach(part IN LISTS ARGN)
set(msg ${msg}${part})
endforeach()
message([info_f] ${msg})
ENDFUNCTION()
MACRO(info_m)
set(msg )
foreach(part IN LISTS ARGN)
set(msg ${msg}${part})
endforeach()
message([info_m] ${msg})
ENDMACRO()
message(foo;bar)
info_f(foo;bar)
info_m(foo;bar)
$ cmake .
foo;bar
[info_f] foobar
[info_m]
$
(I like ARGN since it is 'unnamed positional arguments'. Since you have no
named arguments, ARGV == ARGN, but generally speaking I can't think of why
you'd ever need to use ARGV.)
Good point.
--
Matthew
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/**CMake_FAQhttp://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.htmlhttp://cmake.org/cmake/help/support.html
CMake Consulting:
http://cmake.org/cmake/help/**consulting.htmlhttp://cmake.org/cmake/help/consulting.html
CMake Training Courses:
http://cmake.org/cmake/help/**training.htmlhttp://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at http://www.kitware.com/**
opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/**listinfo/cmakehttp://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-commits] CMake branch, next, updated. v2.8.12-3629-g6b4315d
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 6b4315d8a858cf0dca870b236dbe5dbb50ec4b8d (commit)
via af0051f48ac54ff749faff885f05fb9f34037d5a (commit)
via cb4ec606a9e13ed4064fd8f72f00e51ec09ea537 (commit)
via d915819ad1a6c0dafb38dc12c1e1329d8130403f (commit)
via 97124f91a5eaa5b1bf962813e72b1b2406960a76 (commit)
via 8e96353fd85cff5f06bda071f3a11397e3faa757 (commit)
via d99303220922142c2d3fdce5346d0997e4f3b457 (commit)
via 6cea3eeb4b785fa4b72d4a26c9b6df09180ae34c (commit)
via 7e7a1c0a50e9ec589866ea4ebd2d27c1c8424d8f (commit)
from f99823600983f9111ceb8a62ba3280da012f5324 (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=6b4315d8a858cf0dca870b236dbe5dbb50ec4b8d
commit 6b4315d8a858cf0dca870b236dbe5dbb50ec4b8d
Merge: f998236 af0051f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:20:45 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:20:45 2013 -0400
Merge topic 'clang-warnings' into next
af0051f curl, bzip2: Suppress warnings by setting initial value
cb4ec60 cmDocumentation: Fix a few doxygen comment errors
d915819 cm*Lexer: Populate empty doxygen @param comment
97124f9 cmTarget: Properly escape @ char in doxygen comments
8e96353 Fix warnings about \brief usage
d993032 cmGraphVizWriter: Add extra space in comment to suppress warning
6cea3ee cmNewLineStyle: Remove useless semi-colon
7e7a1c0 curl: Fix typo in header include guard
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af0051f48ac54ff749faff885f05fb9f34037d5a
commit af0051f48ac54ff749faff885f05fb9f34037d5a
Author: Sean McBride s...@rogue-research.com
AuthorDate: Thu Sep 19 15:07:51 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:16:33 2013 -0400
curl, bzip2: Suppress warnings by setting initial value
Silence clang -Wsometimes-uninitialized warnings.
diff --git a/Utilities/cmbzip2/compress.c b/Utilities/cmbzip2/compress.c
index 7d9b3da..feea233 100644
--- a/Utilities/cmbzip2/compress.c
+++ b/Utilities/cmbzip2/compress.c
@@ -239,7 +239,7 @@ static
void sendMTFValues ( EState* s )
{
Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
- Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
+ Int32 nSelectors = 0, alphaSize, minLen, maxLen, selCtr;
Int32 nGroups, nBytes;
/*--
diff --git a/Utilities/cmcurl/multi.c b/Utilities/cmcurl/multi.c
index b501f29..869d568 100644
--- a/Utilities/cmcurl/multi.c
+++ b/Utilities/cmcurl/multi.c
@@ -763,7 +763,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
struct Curl_message *msg = NULL;
bool connected;
bool async;
- bool protocol_connect;
+ bool protocol_connect = 0;
bool dophase_done;
bool done;
CURLMcode result = CURLM_OK;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb4ec606a9e13ed4064fd8f72f00e51ec09ea537
commit cb4ec606a9e13ed4064fd8f72f00e51ec09ea537
Author: Sean McBride s...@rogue-research.com
AuthorDate: Thu Sep 19 13:08:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:16:32 2013 -0400
cmDocumentation: Fix a few doxygen comment errors
Warned by clang -Wdocumentation
diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h
index e180f60..218f44d 100644
--- a/Source/cmDocumentation.h
+++ b/Source/cmDocumentation.h
@@ -154,11 +154,11 @@ public:
/**
* Retrieve the list of documented module located in
* path which match the globing expression globExpr.
- * @param[in] path, directory where to start the search
+ * @param[in] path directory where to start the search
* we will recurse into it.
- * @param[in] globExpr, the globing expression used to
+ * @param[in] globExpr the globing expression used to
* match the file in path.
- * @param[out] the list of obtained pairs (may be empty)
+ * @param[out] docModuleList the list of obtained pairs (may be empty)
* @return 0 on success 1 on error or empty list
*/
int getDocumentedModulesListInDir(
@@ -180,10 +180,9 @@ public:
* @param[in] fname the script file name to be parsed for documentation
* @param[in,out] commands the vector of command/macros documentation
*entry found in the script file.
- * @param[in,out] the cmake object instance to which variable documentation
- *will be attached (using @see cmake::DefineProperty)
- * @param[in] the documentation section in which the property will be
- *inserted.
[Cmake-commits] CMake branch, next, updated. v2.8.12-3631-g83357a9
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 83357a929a9f01361a7783045077314289edab94 (commit)
via eb2decc02d28f41a3e189d5387be24552c42060f (commit)
from 6b4315d8a858cf0dca870b236dbe5dbb50ec4b8d (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=83357a929a9f01361a7783045077314289edab94
commit 83357a929a9f01361a7783045077314289edab94
Merge: 6b4315d eb2decc
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:22:43 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:22:43 2013 -0400
Merge topic 'ctest_rerun_failed' into next
eb2decc ctest: Add --rerun-failed option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb2decc02d28f41a3e189d5387be24552c42060f
commit eb2decc02d28f41a3e189d5387be24552c42060f
Author: Zack Galbreath zack.galbre...@kitware.com
AuthorDate: Tue Sep 24 14:20:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:18:13 2013 -0400
ctest: Add --rerun-failed option
Add a new command line argument to ctest. This allows users to
rerun tests that failed during the previous call to ctest. This
is accomplished by analyzing the most recently modified file named
^LastTestsFailed* in the Testing/Temporary subdirectory of the
project's binary directory.
diff --git a/Source/CTest/cmCTestTestHandler.cxx
b/Source/CTest/cmCTestTestHandler.cxx
index 497774d..167d48e 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -20,6 +20,7 @@
#include cmsys/Process.h
#include cmsys/RegularExpression.hxx
#include cmsys/Base64.h
+#include cmsys/Directory.hxx
#include cmMakefile.h
#include cmGlobalGenerator.h
#include cmLocalGenerator.h
@@ -537,6 +538,7 @@ int cmCTestTestHandler::ProcessHandler()
this-UseExcludeRegExp();
this-SetExcludeRegExp(val);
}
+ this-SetRerunFailed(cmSystemTools::IsOn(this-GetOption(RerunFailed)));
this-TestResults.clear();
@@ -819,6 +821,13 @@ void cmCTestTestHandler::ComputeTestList()
{
this-TestList.clear(); // clear list of test
this-GetListOfTests();
+
+ if (this-RerunFailed)
+{
+this-ComputeTestListForRerunFailed();
+return;
+}
+
cmCTestTestHandler::ListOfTests::size_type tmsize = this-TestList.size();
// how many tests are in based on RegExp?
int inREcnt = 0;
@@ -881,9 +890,47 @@ void cmCTestTestHandler::ComputeTestList()
this-TotalNumberOfTests = this-TestList.size();
// Set the TestList to the final list of all test
this-TestList = finalList;
+
+ this-UpdateMaxTestNameWidth();
+}
+
+void cmCTestTestHandler::ComputeTestListForRerunFailed()
+{
+ this-ExpandTestsToRunInformationForRerunFailed();
+
+ cmCTestTestHandler::ListOfTests::iterator it;
+ ListOfTests finalList;
+ int cnt = 0;
+ for ( it = this-TestList.begin(); it != this-TestList.end(); it ++ )
+{
+cnt ++;
+
+// if this test is not in our list of tests to run, then skip it.
+if ((this-TestsToRun.size()
+ std::find(this-TestsToRun.begin(), this-TestsToRun.end(), cnt)
+ == this-TestsToRun.end()))
+ {
+ continue;
+ }
+
+it-Index = cnt;
+finalList.push_back(*it);
+}
+
+ // Save the total number of tests before exclusions
+ this-TotalNumberOfTests = this-TestList.size();
+
+ // Set the TestList to the list of failed tests to rerun
+ this-TestList = finalList;
+
+ this-UpdateMaxTestNameWidth();
+}
+
+void cmCTestTestHandler::UpdateMaxTestNameWidth()
+{
std::string::size_type max = this-CTest-GetMaxTestNameWidth();
- for (it = this-TestList.begin();
- it != this-TestList.end(); it ++ )
+ for ( cmCTestTestHandler::ListOfTests::iterator it = this-TestList.begin();
+it != this-TestList.end(); it ++ )
{
cmCTestTestProperties p = *it;
if(max p.Name.size())
@@ -1708,6 +1755,91 @@ void
cmCTestTestHandler::ExpandTestsToRunInformation(size_t numTests)
this-TestsToRun.erase(new_end, this-TestsToRun.end());
}
+void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed()
+{
+
+ std::string dirName = this-CTest-GetBinaryDir() + /Testing/Temporary;
+
+ cmsys::Directory directory;
+ if (directory.Load(dirName.c_str()) == 0)
+{
+cmCTestLog(this-CTest, ERROR_MESSAGE, Unable to read the contents of
+ dirName std::endl);
+return;
+}
+
+ int numFiles = static_castint
+(cmsys::Directory::GetNumberOfFilesInDirectory(dirName.c_str()));
+ std::string pattern = LastTestsFailed;
+ std::string logName = ;
+
+ for (int i = 0; i numFiles; ++i)
+{
+
[Cmake-commits] CMake branch, next, updated. v2.8.12-3633-gfe488fa
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 fe488fa93b91cd5b78733fe344288b1b70b82115 (commit)
via d0ec3a01a61f259768d31fc20791780807e1788e (commit)
from 83357a929a9f01361a7783045077314289edab94 (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=fe488fa93b91cd5b78733fe344288b1b70b82115
commit fe488fa93b91cd5b78733fe344288b1b70b82115
Merge: 83357a9 d0ec3a0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:24:44 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:24:44 2013 -0400
Merge topic 'Add-coverage.py-Coverage' into next
d0ec3a0 Adding support for the Python coverage.py tool.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0ec3a01a61f259768d31fc20791780807e1788e
commit d0ec3a01a61f259768d31fc20791780807e1788e
Author: Patrick Reynolds patrick.reyno...@kitware.com
AuthorDate: Fri Sep 27 10:42:39 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:20:30 2013 -0400
Adding support for the Python coverage.py tool.
This assumes that coverage.py has been run in such a way to produce its
standard XML output. This uses the Cobertura schema and should be somewhat
generalizable.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 8412e3e..50e9d2b 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -439,6 +439,7 @@ set(CTEST_SRCS cmCTest.cxx
CTest/cmParseCacheCoverage.cxx
CTest/cmParseGTMCoverage.cxx
CTest/cmParsePHPCoverage.cxx
+ CTest/cmParsePythonCoverage.cxx
CTest/cmCTestEmptyBinaryDirectoryCommand.cxx
CTest/cmCTestGenericHandler.cxx
CTest/cmCTestHandlerCommand.cxx
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx
b/Source/CTest/cmCTestCoverageHandler.cxx
index 20aded2..ef071b9 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -11,6 +11,7 @@
*/
#include cmCTestCoverageHandler.h
#include cmParsePHPCoverage.h
+#include cmParsePythonCoverage.h
#include cmParseGTMCoverage.h
#include cmParseCacheCoverage.h
#include cmCTest.h
@@ -392,6 +393,13 @@ int cmCTestCoverageHandler::ProcessHandler()
{
return error;
}
+ file_count += this-HandlePythonCoverage(cont);
+ error = cont.Error;
+ if ( file_count 0 )
+{
+return error;
+}
+
file_count += this-HandleMumpsCoverage(cont);
error = cont.Error;
if ( file_count 0 )
@@ -761,6 +769,32 @@ int cmCTestCoverageHandler::HandlePHPCoverage(
}
return static_castint(cont-TotalCoverage.size());
}
+
+//--
+int cmCTestCoverageHandler::HandlePythonCoverage(
+ cmCTestCoverageHandlerContainer* cont)
+{
+ cmParsePythonCoverage cov(*cont, this-CTest);
+
+ // Assume the coverage.xml is in the source directory
+ std::string coverageXMLFile = this-CTest-GetBinaryDir() + /coverage.xml;
+
+ if(cmSystemTools::FileExists(coverageXMLFile.c_str()))
+{
+cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT,
+ Parsing coverage.py XML file: coverageXMLFile
+std::endl);
+cov.ReadCoverageXML(coverageXMLFile.c_str());
+}
+ else
+{
+cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT,
+ Cannot find coverage.py XML file: coverageXMLFile
+std::endl);
+}
+ return static_castint(cont-TotalCoverage.size());
+}
+
//--
int cmCTestCoverageHandler::HandleMumpsCoverage(
cmCTestCoverageHandlerContainer* cont)
diff --git a/Source/CTest/cmCTestCoverageHandler.h
b/Source/CTest/cmCTestCoverageHandler.h
index 92b0b22..3506928 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -70,6 +70,10 @@ private:
//! Handle coverage using xdebug php coverage
int HandlePHPCoverage(cmCTestCoverageHandlerContainer* cont);
+
+ //! Handle coverage for Python with coverage.py
+ int HandlePythonCoverage(cmCTestCoverageHandlerContainer* cont);
+
//! Handle coverage for mumps
int HandleMumpsCoverage(cmCTestCoverageHandlerContainer* cont);
diff --git a/Source/CTest/cmParsePythonCoverage.cxx
b/Source/CTest/cmParsePythonCoverage.cxx
new file mode 100644
index 000..a086f13
--- /dev/null
+++ b/Source/CTest/cmParsePythonCoverage.cxx
@@ -0,0 +1,113 @@
+#include cmStandardIncludes.h
+#include cmSystemTools.h
+#include cmXMLParser.h
+#include cmParsePythonCoverage.h
+#include cmsys/Directory.hxx
+
[Cmake-commits] CMake branch, next, updated. v2.8.12-3635-gaeb4cdb
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 aeb4cdbf2997deef2afe0d76543ec377500d9f20 (commit) via 455bad19f617987539d100453e716e1c9bb86784 (commit) from fe488fa93b91cd5b78733fe344288b1b70b82115 (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=aeb4cdbf2997deef2afe0d76543ec377500d9f20 commit aeb4cdbf2997deef2afe0d76543ec377500d9f20 Merge: fe488fa 455bad1 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 09:27:12 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 09:27:12 2013 -0400 Merge topic 'cxx-flags' into next 455bad1 Check*CompilerFlag: Add SunStudio 12 regex http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=455bad19f617987539d100453e716e1c9bb86784 commit 455bad19f617987539d100453e716e1c9bb86784 Author: William Orr w...@worrbase.com AuthorDate: Fri Sep 27 16:48:26 2013 -0700 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Oct 8 09:23:01 2013 -0400 Check*CompilerFlag: Add SunStudio 12 regex Applied-by: Rolf Eike Beer e...@sf-mail.de diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake index abe1ec5..9d8ba9e 100644 --- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake +++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake @@ -36,5 +36,6 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR) FAIL_REGEX File with unknown suffix passed to linker # PGI FAIL_REGEX WARNING: unknown flag:# Open64 FAIL_REGEX Incorrect command line option:# Borland + FAIL_REGEX Warning: illegal option # SunStudio 12 ) endmacro () --- 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. v2.8.12-3639-gef5a2f31
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 ef5a2f31b3179eca559d8c7ad087a347a8b7610f (commit)
via 1603fe092d217781739011faa31268ccba2b4390 (commit)
via faf10d0f95de7174a86493c21c03b16cba06fec7 (commit)
via 705d70edf12609ae2738db19b4d1fd96c839a0bd (commit)
from aeb4cdbf2997deef2afe0d76543ec377500d9f20 (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=ef5a2f31b3179eca559d8c7ad087a347a8b7610f
commit ef5a2f31b3179eca559d8c7ad087a347a8b7610f
Merge: aeb4cdb 1603fe0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:44:17 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:44:17 2013 -0400
Merge topic 'CheckStructHasMember_CXX' into next
1603fe0 Merge branch 'deprecation-message' into CheckStructHasMember_CXX
faf10d0 message: Document DEPRECATION mode
705d70e Rename test RunCMake.{deprecation = message}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1603fe092d217781739011faa31268ccba2b4390
commit 1603fe092d217781739011faa31268ccba2b4390
Merge: e04402f faf10d0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:40:09 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:40:09 2013 -0400
Merge branch 'deprecation-message' into CheckStructHasMember_CXX
Resolve conflict in Tests/RunCMake/CMakeLists.txt by combining both
changes.
diff --cc Tests/RunCMake/CMakeLists.txt
index f1c09bc,9a7f487..5b9fe38
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -119,5 -120,3 +120,4 @@@ endif(
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
- add_RunCMake_test(deprecation)
+add_RunCMake_test(CheckModules)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faf10d0f95de7174a86493c21c03b16cba06fec7
commit faf10d0f95de7174a86493c21c03b16cba06fec7
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:36:27 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:36:27 2013 -0400
message: Document DEPRECATION mode
diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h
index fc61810..a053bdd 100644
--- a/Source/cmMessageCommand.h
+++ b/Source/cmMessageCommand.h
@@ -60,9 +60,8 @@ public:
virtual const char* GetFullDocumentation() const
{
return
-message([STATUS|WARNING|AUTHOR_WARNING|FATAL_ERROR|SEND_ERROR]\n
-\message to display\ ...)\n
- The optional keyword determines the type of message:\n
+message([mode] \message to display\ ...)\n
+ The optional mode keyword determines the type of message:\n
(none) = Important information\n
STATUS = Incidental information\n
WARNING= CMake Warning, continue processing\n
@@ -70,6 +69,9 @@ public:
SEND_ERROR = CMake Error, continue processing,\n
but skip generation\n
FATAL_ERROR= CMake Error, stop processing and generation\n
+DEPRECATION= CMake Deprecation Error or Warning if variable\n
+ CMAKE_ERROR_DEPRECATED or CMAKE_WARN_DEPRECATED\n
+ is enabled, respectively, else no message.\n
The CMake command-line tool displays STATUS messages on stdout
and all other message types on stderr.
The CMake GUI displays all messages in its log area.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=705d70edf12609ae2738db19b4d1fd96c839a0bd
commit 705d70edf12609ae2738db19b4d1fd96c839a0bd
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:26:46 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:29:11 2013 -0400
Rename test RunCMake.{deprecation = message}
It covers message() command cases. Others could be added later.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index cc52e9e..9a7f487 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -95,6 +95,7 @@ add_RunCMake_test(if)
add_RunCMake_test(include)
add_RunCMake_test(include_directories)
add_RunCMake_test(list)
+add_RunCMake_test(message)
add_RunCMake_test(try_compile)
add_RunCMake_test(variable_watch)
add_RunCMake_test(CMP0004)
@@ -119,4 +120,3 @@ endif()
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
-add_RunCMake_test(deprecation)
diff --git a/Tests/RunCMake/deprecation/CMakeLists.txt
[Cmake-commits] CMake branch, next, updated. v2.8.12-3641-g78df8eb
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 78df8eb24eb06cc1fa1ae98d762da206d29bd7ca (commit)
via 73d28d2177a8b014f8807a61d14d3064c5d5c033 (commit)
from ef5a2f31b3179eca559d8c7ad087a347a8b7610f (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=78df8eb24eb06cc1fa1ae98d762da206d29bd7ca
commit 78df8eb24eb06cc1fa1ae98d762da206d29bd7ca
Merge: ef5a2f31 73d28d2
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:50:16 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:50:16 2013 -0400
Merge topic 'CheckStructHasMember_CXX' into next
73d28d2 CheckStructHasMember: Add support for C++
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73d28d2177a8b014f8807a61d14d3064c5d5c033
commit 73d28d2177a8b014f8807a61d14d3064c5d5c033
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Sep 20 15:10:40 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:43:06 2013 -0400
CheckStructHasMember: Add support for C++
Previously if headers required to check if a struct has a member can be
compiled with C++ compiler only, the check would fail because the C
compiler fails. As a consequence, the result variable would be set to
false, even if the struct has that particular member.
Teach CHECK_STRUCT_HAS_MEMBER to accept a new optional argument LANGUAGE
that allows one to explicitly set the compiler to use. The new
signature is therefore:
CHECK_STRUCT_HAS_MEMBER (struct member header variable
[LANGUAGE language])
diff --git a/Modules/CheckStructHasMember.cmake
b/Modules/CheckStructHasMember.cmake
index ea2891c..d28cc2a 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -1,10 +1,12 @@
# - Check if the given struct or class has the specified member variable
-# CHECK_STRUCT_HAS_MEMBER (STRUCT MEMBER HEADER VARIABLE)
+# CHECK_STRUCT_HAS_MEMBER (struct member header variable
+# [LANGUAGE language])
#
-# STRUCT - the name of the struct or class you are interested in
-# MEMBER - the member which existence you want to check
-# HEADER - the header(s) where the prototype should be declared
-# VARIABLE - variable to store the result
+# struct - the name of the struct or class you are interested in
+# member - the member which existence you want to check
+# header - the header(s) where the prototype should be declared
+# variable - variable to store the result
+# language - the compiler to use (C or CXX)
#
# The following variables may be set before calling this macro to
# modify the way the check is run:
@@ -12,8 +14,9 @@
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
# CMAKE_REQUIRED_INCLUDES = list of include directories
+# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
#
-# Example: CHECK_STRUCT_HAS_MEMBER(struct timeval tv_sec sys/select.h
HAVE_TIMEVAL_TV_SEC)
+# Example: CHECK_STRUCT_HAS_MEMBER(struct timeval tv_sec sys/select.h
HAVE_TIMEVAL_TV_SEC LANGUAGE C)
#=
# Copyright 2007-2009 Kitware, Inc.
@@ -29,6 +32,7 @@
# License text for the above reference.)
include(CheckCSourceCompiles)
+include(CheckCXXSourceCompiles)
macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
set(_INCLUDE_FILES)
@@ -36,16 +40,29 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER
_RESULT)
set(_INCLUDE_FILES ${_INCLUDE_FILES}#include ${it}\n)
endforeach ()
+ if(x${ARGN} STREQUAL x)
+ set(_lang C)
+ elseif(x${ARGN} MATCHES ^xLANGUAGE;([a-zA-Z]+)$)
+ set(_lang ${CMAKE_MATCH_1})
+ else()
+ message(FATAL_ERROR Unknown arguments:\n ${ARGN}\n)
+ endif()
+
set(_CHECK_STRUCT_MEMBER_SOURCE_CODE
${_INCLUDE_FILES}
int main()
{
${_STRUCT}* tmp;
tmp-${_MEMBER};
- return 0;
+ return 0;
}
)
- CHECK_C_SOURCE_COMPILES(${_CHECK_STRUCT_MEMBER_SOURCE_CODE} ${_RESULT})
+ if(${_lang} STREQUAL C)
+ CHECK_C_SOURCE_COMPILES(${_CHECK_STRUCT_MEMBER_SOURCE_CODE} ${_RESULT})
+ elseif(${_lang} STREQUAL CXX)
+ CHECK_CXX_SOURCE_COMPILES(${_CHECK_STRUCT_MEMBER_SOURCE_CODE}
${_RESULT})
+ else()
+ message(FATAL_ERROR Unknown language:\n ${_lang}\nSupported languages:
C, CXX.\n)
+ endif()
endmacro ()
-
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index be7ddbc..7586de6 100644
---
[Cmake-commits] CMake branch, next, updated. v2.8.12-3644-gca6f939
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 ca6f939166f6f7f59b7c19475ec2571983bcfaa9 (commit)
via 17efd4dfc5553e91376f0e645f6088895b117bad (commit)
via 6fa6b975725b06dd90279515dc175422edf3 (commit)
from 78df8eb24eb06cc1fa1ae98d762da206d29bd7ca (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=ca6f939166f6f7f59b7c19475ec2571983bcfaa9
commit ca6f939166f6f7f59b7c19475ec2571983bcfaa9
Merge: 78df8eb 17efd4df
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:51:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:51:12 2013 -0400
Merge topic 'deprecation-message' into next
17efd4df Qt4Macros: Port to use message(DEPRECATION)
6fa message: Add a DEPRECATION mode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17efd4dfc5553e91376f0e645f6088895b117bad
commit 17efd4dfc5553e91376f0e645f6088895b117bad
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Sep 17 19:11:39 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:41:55 2013 -0400
Qt4Macros: Port to use message(DEPRECATION)
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f1aedd7..bb5d011 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -355,15 +355,7 @@ endmacro()
macro(QT4_AUTOMOC)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The qt4_automoc macro is obsolete. Use the
CMAKE_AUTOMOC feature instead.)
-endif()
+message(DEPRECATION The qt4_automoc macro is obsolete. Use the
CMAKE_AUTOMOC feature instead.)
endif()
QT4_GET_MOC_FLAGS(_moc_INCS)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
index 6f7e8ee..f358cc4 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
Call Stack \(most recent call first\):
AutomocMacro-WARN.cmake:7 \(qt4_automoc\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fa6b975725b06dd90279515dc175422edf3
commit 6fa6b975725b06dd90279515dc175422edf3
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Sep 17 18:54:34 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:41:37 2013 -0400
message: Add a DEPRECATION mode
By default, the message is not issued. If CMAKE_ERROR_DEPRECATED
is on, the message is fatal. If CMAKE_WARN_DEPRECATED is on, the
message is a warning.
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index e1dbf34..d85e720 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -52,6 +52,23 @@ bool cmMessageCommand
status = true;
++i;
}
+ else if (*i == DEPRECATION)
+{
+if (this-Makefile-IsOn(CMAKE_ERROR_DEPRECATED))
+ {
+ fatal = true;
+ type = cmake::DEPRECATION_ERROR;
+ }
+else if (this-Makefile-IsOn(CMAKE_WARN_DEPRECATED))
+ {
+ type = cmake::DEPRECATION_WARNING;
+ }
+else
+ {
+ return true;
+ }
+++i;
+}
for(;i != args.end(); ++i)
{
diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h
index fc61810..a053bdd 100644
--- a/Source/cmMessageCommand.h
+++ b/Source/cmMessageCommand.h
@@ -60,9 +60,8 @@ public:
virtual const char* GetFullDocumentation() const
{
return
-message([STATUS|WARNING|AUTHOR_WARNING|FATAL_ERROR|SEND_ERROR]\n
-\message to display\ ...)\n
- The optional keyword determines the type of message:\n
+message([mode] \message to display\ ...)\n
+ The optional mode keyword determines the type of message:\n
(none) = Important information\n
STATUS = Incidental information\n
WARNING= CMake Warning, continue processing\n
@@ -70,6 +69,9 @@ public:
SEND_ERROR = CMake Error, continue processing,\n
but skip generation\n
FATAL_ERROR= CMake Error, stop processing and generation\n
+DEPRECATION
[Cmake-commits] CMake branch, master, updated. v2.8.12-111-g5bf7102
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 5bf71025056465ebacf49b9da6446b8ed7833a95 (commit) via eb2decc02d28f41a3e189d5387be24552c42060f (commit) from 5a364d8ed54bbfb1d3d6378503b2772256ac2a17 (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=5bf71025056465ebacf49b9da6446b8ed7833a95 commit 5bf71025056465ebacf49b9da6446b8ed7833a95 Merge: 5a364d8 eb2decc Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 09:53:17 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 09:53:17 2013 -0400 Merge topic 'ctest_rerun_failed' eb2decc ctest: Add --rerun-failed option --- Summary of changes: Source/CTest/cmCTestTestHandler.cxx | 136 ++- Source/CTest/cmCTestTestHandler.h | 15 Source/cmCTest.cxx |6 ++ Source/ctest.cxx|7 ++ Tests/CMakeLists.txt| 10 +++ 5 files changed, 172 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, master, updated. v2.8.12-118-g4340507
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 4340507207830c5d82ca59b2e82cddf6dbf8f36b (commit)
via 73d28d2177a8b014f8807a61d14d3064c5d5c033 (commit)
from b7a865c5fefd669a6e1296c50704dc4fc7212984 (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=4340507207830c5d82ca59b2e82cddf6dbf8f36b
commit 4340507207830c5d82ca59b2e82cddf6dbf8f36b
Merge: b7a865c 73d28d2
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:53:37 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:53:37 2013 -0400
Merge topic 'CheckStructHasMember_CXX'
73d28d2 CheckStructHasMember: Add support for C++
---
Summary of changes:
Modules/CheckStructHasMember.cmake | 35 ++--
Tests/CMakeOnly/CMakeLists.txt |2 +
.../CMakeOnly/CheckStructHasMember/CMakeLists.txt | 93
Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h |9 ++
Tests/CMakeOnly/CheckStructHasMember/cm_cshm.hxx | 16
Tests/RunCMake/CMakeLists.txt |1 +
.../CMakeLists.txt |0
.../CheckStructHasMemberMissingKey-result.txt} |0
.../CheckStructHasMemberMissingKey-stderr.txt |8 ++
.../CheckStructHasMemberMissingKey.cmake |2 +
...CheckStructHasMemberMissingLanguage-result.txt} |0
.../CheckStructHasMemberMissingLanguage-stderr.txt |8 ++
.../CheckStructHasMemberMissingLanguage.cmake |2 +
.../CheckModules/CheckStructHasMemberOk.cmake |4 +
...heckStructHasMemberTooManyArguments-result.txt} |0
...CheckStructHasMemberTooManyArguments-stderr.txt |8 ++
.../CheckStructHasMemberTooManyArguments.cmake |2 +
...CheckStructHasMemberUnknownLanguage-result.txt} |0
.../CheckStructHasMemberUnknownLanguage-stderr.txt | 10 ++
.../CheckStructHasMemberUnknownLanguage.cmake |2 +
.../CheckStructHasMemberWrongKey-result.txt} |0
.../CheckStructHasMemberWrongKey-stderr.txt|8 ++
.../CheckStructHasMemberWrongKey.cmake |2 +
Tests/RunCMake/CheckModules/RunCMakeTest.cmake |8 ++
24 files changed, 211 insertions(+), 9 deletions(-)
create mode 100644 Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
create mode 100644 Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h
create mode 100644 Tests/CMakeOnly/CheckStructHasMember/cm_cshm.hxx
copy Tests/RunCMake/{ObsoleteQtMacros = CheckModules}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CheckModules/CheckStructHasMemberMissingKey-result.txt} (100%)
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CheckModules/CheckStructHasMemberMissingLanguage-result.txt} (100%)
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage.cmake
create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CheckModules/CheckStructHasMemberTooManyArguments-result.txt} (100%)
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-stderr.txt
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CheckModules/CheckStructHasMemberUnknownLanguage-result.txt} (100%)
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-stderr.txt
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CheckModules/CheckStructHasMemberWrongKey-result.txt} (100%)
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-stderr.txt
create mode 100644
Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey.cmake
create mode 100644 Tests/RunCMake/CheckModules/RunCMakeTest.cmake
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. v2.8.12-109-g5a364d8
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 5a364d8ed54bbfb1d3d6378503b2772256ac2a17 (commit) via af0051f48ac54ff749faff885f05fb9f34037d5a (commit) via cb4ec606a9e13ed4064fd8f72f00e51ec09ea537 (commit) via d915819ad1a6c0dafb38dc12c1e1329d8130403f (commit) via 97124f91a5eaa5b1bf962813e72b1b2406960a76 (commit) via 8e96353fd85cff5f06bda071f3a11397e3faa757 (commit) via d99303220922142c2d3fdce5346d0997e4f3b457 (commit) via 6cea3eeb4b785fa4b72d4a26c9b6df09180ae34c (commit) via 7e7a1c0a50e9ec589866ea4ebd2d27c1c8424d8f (commit) from cfb2c66f66eaeb4bb2c2d9cc24608fbb49d63986 (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=5a364d8ed54bbfb1d3d6378503b2772256ac2a17 commit 5a364d8ed54bbfb1d3d6378503b2772256ac2a17 Merge: cfb2c66 af0051f Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 09:53:13 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 09:53:13 2013 -0400 Merge topic 'clang-warnings' af0051f curl, bzip2: Suppress warnings by setting initial value cb4ec60 cmDocumentation: Fix a few doxygen comment errors d915819 cm*Lexer: Populate empty doxygen @param comment 97124f9 cmTarget: Properly escape @ char in doxygen comments 8e96353 Fix warnings about \brief usage d993032 cmGraphVizWriter: Add extra space in comment to suppress warning 6cea3ee cmNewLineStyle: Remove useless semi-colon 7e7a1c0 curl: Fix typo in header include guard --- Summary of changes: Source/cmAddCustomCommandCommand.h |4 +--- Source/cmCommandArgumentLexer.cxx |4 ++-- Source/cmCreateTestSourceList.h|2 +- Source/cmDependsFortranLexer.cxx |4 ++-- Source/cmDependsJavaLexer.cxx |4 ++-- Source/cmDocumentation.h | 13 ++--- Source/cmExprLexer.cxx |4 ++-- Source/cmGraphVizWriter.cxx|4 ++-- Source/cmIncludeCommand.h |4 +--- Source/cmNewLineStyle.cxx |2 +- Source/cmTarget.h |6 +++--- Utilities/cmbzip2/compress.c |2 +- Utilities/cmcurl/multi.c |2 +- Utilities/cmcurl/parsedate.h |2 +- 14 files changed, 26 insertions(+), 31 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. v2.8.12-3651-gfe9a6a7
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 fe9a6a71cfd30510ca465a5b5600f44ebc46331e (commit) via 4340507207830c5d82ca59b2e82cddf6dbf8f36b (commit) via b7a865c5fefd669a6e1296c50704dc4fc7212984 (commit) via 2ba45f52857dc0a98edb4e392b27276ea927e92c (commit) via 5bf71025056465ebacf49b9da6446b8ed7833a95 (commit) via 5a364d8ed54bbfb1d3d6378503b2772256ac2a17 (commit) via cfb2c66f66eaeb4bb2c2d9cc24608fbb49d63986 (commit) from ca6f939166f6f7f59b7c19475ec2571983bcfaa9 (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=fe9a6a71cfd30510ca465a5b5600f44ebc46331e commit fe9a6a71cfd30510ca465a5b5600f44ebc46331e Merge: ca6f939 4340507 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 09:50:35 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Oct 8 09:50:35 2013 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 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. v2.8.12-116-gb7a865c
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 b7a865c5fefd669a6e1296c50704dc4fc7212984 (commit)
via 455bad19f617987539d100453e716e1c9bb86784 (commit)
via 6f3ebfed983df5f171a2009360fea02e6efbfb56 (commit)
from 2ba45f52857dc0a98edb4e392b27276ea927e92c (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=b7a865c5fefd669a6e1296c50704dc4fc7212984
commit b7a865c5fefd669a6e1296c50704dc4fc7212984
Merge: 2ba45f5 455bad1
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:53:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:53:31 2013 -0400
Merge topic 'cxx-flags'
455bad1 Check*CompilerFlag: Add SunStudio 12 regex
6f3ebfe Check*CompilerFlag: make C and CXX modules share most error
patterns (#14339)
---
Summary of changes:
... = CMakeCheckCompilerFlagCommonPatterns.cmake} | 46 +---
Modules/CheckCCompilerFlag.cmake | 16 ++-
Modules/CheckCXXCompilerFlag.cmake | 19 ++--
3 files changed, 21 insertions(+), 60 deletions(-)
copy Modules/{CheckCXXCompilerFlag.cmake =
CMakeCheckCompilerFlagCommonPatterns.cmake} (50%)
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. v2.8.12-113-g2ba45f5
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 2ba45f52857dc0a98edb4e392b27276ea927e92c (commit)
via d0ec3a01a61f259768d31fc20791780807e1788e (commit)
from 5bf71025056465ebacf49b9da6446b8ed7833a95 (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=2ba45f52857dc0a98edb4e392b27276ea927e92c
commit 2ba45f52857dc0a98edb4e392b27276ea927e92c
Merge: 5bf7102 d0ec3a0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:53:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:53:25 2013 -0400
Merge topic 'Add-coverage.py-Coverage'
d0ec3a0 Adding support for the Python coverage.py tool.
---
Summary of changes:
Source/CMakeLists.txt |1 +
Source/CTest/cmCTestCoverageHandler.cxx| 34 ++
Source/CTest/cmCTestCoverageHandler.h |4 +
Source/CTest/cmParsePythonCoverage.cxx | 113
Source/CTest/cmParsePythonCoverage.h | 48
Tests/CMakeLists.txt | 19
.../DartConfiguration.tcl.in |4 +-
Tests/PythonCoverage/coverage.xml.in | 35 ++
Tests/PythonCoverage/coveragetest/foo.py |8 ++
Tests/PythonCoverage/coveragetest/test_foo.py | 11 ++
10 files changed, 275 insertions(+), 2 deletions(-)
create mode 100644 Source/CTest/cmParsePythonCoverage.cxx
create mode 100644 Source/CTest/cmParsePythonCoverage.h
copy Tests/{MumpsCoverage = PythonCoverage}/DartConfiguration.tcl.in (62%)
create mode 100644 Tests/PythonCoverage/coverage.xml.in
create mode 100644 Tests/PythonCoverage/coveragetest/foo.py
create mode 100644 Tests/PythonCoverage/coveragetest/test_foo.py
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. v2.8.12-3654-g2fdb710
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 2fdb710b7eb214a001d28209eb2d30c4e75cc5a5 (commit)
via f59693b971819c0442657ed025ff009da6217103 (commit)
via 1a39f857f705604818b81ed38a3d7de2d1b66fa6 (commit)
from fe9a6a71cfd30510ca465a5b5600f44ebc46331e (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=2fdb710b7eb214a001d28209eb2d30c4e75cc5a5
commit 2fdb710b7eb214a001d28209eb2d30c4e75cc5a5
Merge: fe9a6a7 f59693b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:57:43 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 09:57:43 2013 -0400
Merge topic 'update-kwsys' into next
f59693b Merge branch 'upstream-kwsys' into update-kwsys
1a39f85 KWSys 2013-10-08 (96b2f6f4)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59693b971819c0442657ed025ff009da6217103
commit f59693b971819c0442657ed025ff009da6217103
Merge: 4340507 1a39f85
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 09:53:13 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:53:13 2013 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a39f857f705604818b81ed38a3d7de2d1b66fa6
commit 1a39f857f705604818b81ed38a3d7de2d1b66fa6
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Tue Oct 8 08:29:16 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 09:53:08 2013 -0400
KWSys 2013-10-08 (96b2f6f4)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 96b2f6f4 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' deec6b8a..96b2f6f4
Adrien Destugues (2):
2b303bd7 SystemTools: Remove outdated preprocessor checks for Haiku
96b2f6f4 DynamicLoader: Cleanup test include files for Haiku
Rolf Eike Beer (1):
dbc8fa1b SystemInformation: fix truncation warnings
Change-Id: I25364f58d62dd73fde0f7625d9d77ed0d4726e33
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index beefd7d..7c31f3a 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1734,12 +1734,12 @@ int
SystemInformationImplementation::GetFullyQualifiedDomainName(
{
char host[NI_MAXHOST]={'\0'};
- socklen_t addrlen
+ const size_t addrlen
= (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct
sockaddr_in6));
ierr=getnameinfo(
ifa-ifa_addr,
-addrlen,
+static_castsocklen_t(addrlen),
host,
NI_MAXHOST,
NULL,
@@ -3836,7 +3836,8 @@ bool SystemInformationImplementation::QueryLinuxMemory()
unsigned long temp;
unsigned long cachedMem;
unsigned long buffersMem;
-char *r=fgets(buffer, sizeof(buffer), fd); // Skip total: used:...
+// Skip total: used:...
+char *r=fgets(buffer, static_castint(sizeof(buffer)), fd);
int status=0;
if(r==buffer)
{
diff --git a/SystemTools.cxx b/SystemTools.cxx
index e9a1fd3..749002d 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -152,11 +152,6 @@ public:
#define _chdir chdir
#endif
-#if defined(__HAIKU__)
-#include os/kernel/OS.h
-#include os/storage/Path.h
-#endif
-
#if defined(__BEOS__) !defined(__ZETA__)
#include be/kernel/OS.h
#include be/storage/Path.h
diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx
index dd6d603..1bff707 100644
--- a/testDynamicLoader.cxx
+++ b/testDynamicLoader.cxx
@@ -15,14 +15,10 @@
#include KWSYS_HEADER(ios/iostream)
#include KWSYS_HEADER(stl/string)
-#if defined(__BEOS__)
+#if defined(__BEOS__) || defined(__HAIKU__)
#include be/kernel/OS.h /* disable_debugger() API. */
#endif
-#if defined(__HAIKU__)
-#include os/kernel/OS.h /* disable_debugger() API. */
-#endif
-
// Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers.
#if 0
---
Summary of changes:
Source/kwsys/SystemInformation.cxx |7 ---
Source/kwsys/SystemTools.cxx |5 -
Source/kwsys/testDynamicLoader.cxx |6 +-
3 files changed, 5 insertions(+), 13 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. v2.8.12-3656-gd17bb22
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 d17bb22c5fba3976a9dcb7564219cf4f4e59aee2 (commit)
via b3ccaed0f9433ff86203df66ac18919f8b08b149 (commit)
from 2fdb710b7eb214a001d28209eb2d30c4e75cc5a5 (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=d17bb22c5fba3976a9dcb7564219cf4f4e59aee2
commit d17bb22c5fba3976a9dcb7564219cf4f4e59aee2
Merge: 2fdb710 b3ccaed
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:07:10 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 10:07:10 2013 -0400
Merge topic 'haiku-updates' into next
b3ccaed Revert FindSDL: Fix broken include paths
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3ccaed0f9433ff86203df66ac18919f8b08b149
commit b3ccaed0f9433ff86203df66ac18919f8b08b149
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:02:47 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 10:03:00 2013 -0400
Revert FindSDL: Fix broken include paths
This reverts commit eac2adb5b46277be16ac2e577e369bdcd4c93339.
As explained in commit 7cb51739 (FindSDL: Restore accidentally dropped
search paths (#13651), 2012-11-05) the include/SDL* path suffixes are
for looking in the ENV{SDLDIR} location. We can add both path suffixes
in s separate topic.
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 6adec1f..fec142e 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -70,7 +70,7 @@
find_path(SDL_INCLUDE_DIR SDL.h
HINTS
ENV SDLDIR
- PATH_SUFFIXES SDL SDL12 SDL11
+ PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
)
# SDL-1.1 is the name used by FreeBSD ports...
---
Summary of changes:
Modules/FindSDL.cmake |2 +-
1 files changed, 1 insertions(+), 1 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. v2.8.12-3661-gfa17293
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 fa172933b6d151351741a99651ab04ce2915aa3f (commit) via 54ef2bea379ca47d961c1bb0fd0ccb026b482810 (commit) via 38d37c4b9a09fdbc2909d014e50172bd51ce (commit) via 1dc61f814277744581bb36ae40c91893c1bef851 (commit) via 7ebc1cb2ff3f79724711247be1edade38a3ef0f4 (commit) from d17bb22c5fba3976a9dcb7564219cf4f4e59aee2 (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=fa172933b6d151351741a99651ab04ce2915aa3f commit fa172933b6d151351741a99651ab04ce2915aa3f Merge: d17bb22 54ef2be Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 10:08:50 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 10:08:50 2013 -0400 Merge topic 'haiku-updates' into next 54ef2be Haiku: Include files cleanup in cmCTest 38d Haiku: Remove outdated preprocessor checks 1dc61f8 Haiku: Remove use of B_COMMON_DIRECTORY 7ebc1cb Haiku: Several fixes to platform module http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54ef2bea379ca47d961c1bb0fd0ccb026b482810 commit 54ef2bea379ca47d961c1bb0fd0ccb026b482810 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 16:59:25 2013 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Oct 8 09:56:16 2013 -0400 Haiku: Include files cleanup in cmCTest * No need to use a different path from the BeOS one, which still works. Applied-by: Rolf Eike Beer e...@sf-mail.de diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index feae61a..98f19cc 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -53,14 +53,10 @@ #include cm_zlib.h #include cmsys/Base64.h -#if defined(__BEOS__) +#if defined(__BEOS__) || defined(__HAIKU__) #include be/kernel/OS.h /* disable_debugger() API. */ #endif -#if defined(__HAIKU__) -#include os/kernel/OS.h /* disable_debugger() API. */ -#endif - #define DEBUGOUT std::cout __LINE__ ; std::cout #define DEBUGERR std::cerr __LINE__ ; std::cerr http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38d37c4b9a09fdbc2909d014e50172bd51ce commit 38d37c4b9a09fdbc2909d014e50172bd51ce Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 16:33:52 2013 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Oct 8 09:55:55 2013 -0400 Haiku: Remove outdated preprocessor checks * Haiku does not define __BEOS__ anymore, so there is no need to guard these BeOS specific workaround for Haiku. * The workaround themselves are not needed for Haiku as it has much better POSIX compatibility than BeOS did. Applied-by: Rolf Eike Beer e...@sf-mail.de diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c index d74a4f0..c5ba7c2 100644 --- a/Utilities/cmcurl/CMake/CurlTests.c +++ b/Utilities/cmcurl/CMake/CurlTests.c @@ -38,7 +38,7 @@ main () # define PLATFORM_AIX_V3 #endif -#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) !defined(__HAIKU__)) +#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) #error O_NONBLOCK does not work on this platform #endif int socket; diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c index 51adbcf..82f9dc2 100644 --- a/Utilities/cmcurl/select.c +++ b/Utilities/cmcurl/select.c @@ -39,7 +39,7 @@ #error We can't compile without select() support! #endif -#if defined(__BEOS__) !defined(__HAIKU__) +#if defined(__BEOS__) /* BeOS has FD_SET defined in socket.h */ #include socket.h #endif diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 6eb52d1..7a3b6fd 100644 --- a/Utilities/cmzlib/zconf.h +++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif -#if defined (__BEOS__) !defined (__HAIKU__) +#if defined (__BEOS__) # ifdef ZLIB_DLL #ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h index 74ef1f8..3053cd8 100644 --- a/Utilities/cmzlib/zutil.h +++ b/Utilities/cmzlib/zutil.h @@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define OS_CODE 0x0f #endif -/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -/* many BeOS workarounds are no longer needed in Haiku */ -#if defined(__HAIKU__) defined(__BEOS__) -#undef __BEOS__ -#endif - #if defined(_BEOS_) || defined(RISCOS) # define fdopen(fd,mode) NULL /* No fdopen() */ #endif
[Cmake-commits] CMake branch, next, updated. v2.8.12-3663-ge2970ea
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 e2970ea1945e8f787a0cb42f2e52103d80ffd72b (commit)
via c5c217c6b53b035303747a2971b1b80be5391566 (commit)
from fa172933b6d151351741a99651ab04ce2915aa3f (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=e2970ea1945e8f787a0cb42f2e52103d80ffd72b
commit e2970ea1945e8f787a0cb42f2e52103d80ffd72b
Merge: fa17293 c5c217c
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:13:59 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 10:13:59 2013 -0400
Merge topic 'FindSDL-path-suffixes' into next
c5c217c FindSDL: Add path suffixes for prefix/include/(SDL|SDL12|SDL11)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5c217c6b53b035303747a2971b1b80be5391566
commit c5c217c6b53b035303747a2971b1b80be5391566
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:07:03 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 10:09:17 2013 -0400
FindSDL: Add path suffixes for prefix/include/(SDL|SDL12|SDL11)
Also add a comment explaining the purpose of the include/SDL* path
suffixes. As explained in commit 7cb51739 (FindSDL: Restore
accidentally dropped search paths (#13651), 2012-11-05) the include/SDL*
path suffixes are for looking in the ENV{SDLDIR} location.
Inspired-by: Adrien Destugues pulkoma...@pulkomandy.tk
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index fec142e..a4f12ba 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -70,7 +70,9 @@
find_path(SDL_INCLUDE_DIR SDL.h
HINTS
ENV SDLDIR
- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
+ PATH_SUFFIXES SDL SDL12 SDL11
+# path suffixes to search inside ENV{SDLDIR}
+include/SDL include/SDL12 include/SDL11 include
)
# SDL-1.1 is the name used by FreeBSD ports...
---
Summary of changes:
Modules/FindSDL.cmake |4 +++-
1 files changed, 3 insertions(+), 1 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. v2.8.12-3665-g4746525
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 47465254bad0794ba5eb34dab78200ef7bc251fd (commit) via 4782d12806f437cff2b5c4dad2262cc7fe906b93 (commit) from e2970ea1945e8f787a0cb42f2e52103d80ffd72b (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=47465254bad0794ba5eb34dab78200ef7bc251fd commit 47465254bad0794ba5eb34dab78200ef7bc251fd Merge: e2970ea 4782d12 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 10:39:55 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 10:39:55 2013 -0400 Merge topic 'FindGTK2-targets' into next 4782d12 Revert FindGTK2 test debugging commits http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4782d12806f437cff2b5c4dad2262cc7fe906b93 commit 4782d12806f437cff2b5c4dad2262cc7fe906b93 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 10:34:34 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Oct 8 10:35:10 2013 -0400 Revert FindGTK2 test debugging commits Revert FindGTK2: Avoid ctest truncation of output and make it verbose. This reverts commit b7c15165a86a7a92150662b389bbcfb0ec165c6c. Revert FindGTK2: Print target info when building the tests. This reverts commit ff69cecc2838127dc2c21e186abcae6bc1f56a15. diff --git a/Tests/FindGTK2/atk/CMakeLists.txt b/Tests/FindGTK2/atk/CMakeLists.txt index f466c2a..be37957 100644 --- a/Tests/FindGTK2/atk/CMakeLists.txt +++ b/Tests/FindGTK2/atk/CMakeLists.txt @@ -2,22 +2,8 @@ cmake_minimum_required(VERSION 2.8) project(atk C) -message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) -set(CMAKE_VERBOSE_MAKEFILE 1) - find_package(GTK2 COMPONENTS gtk REQUIRED) -include(CMakePrintHelpers) -cmake_print_properties(TARGETS GTK2::atk - PROPERTIES IMPORTED_CONFIGURATIONS - IMPORTED_LOCATION_RELEASE - IMPORTED_LOCATION_DEBUG - IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE - IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG - INTERFACE_LINK_LIBRARIES - INTERFACE_INCLUDE_DIRECTORIES - INTERFACE_COMPILE_DEFINITIONS) - set(CMAKE_INCLUDE_CURRENT_DIR ON) add_executable(atk WIN32 main.c) diff --git a/Tests/FindGTK2/atkmm/CMakeLists.txt b/Tests/FindGTK2/atkmm/CMakeLists.txt index 4d537d3..e8320b5 100644 --- a/Tests/FindGTK2/atkmm/CMakeLists.txt +++ b/Tests/FindGTK2/atkmm/CMakeLists.txt @@ -2,22 +2,8 @@ cmake_minimum_required(VERSION 2.8) project(atkmm CXX) -message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) -set(CMAKE_VERBOSE_MAKEFILE 1) - find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) -include(CMakePrintHelpers) -cmake_print_properties(TARGETS GTK2::atkmm - PROPERTIES IMPORTED_CONFIGURATIONS - IMPORTED_LOCATION_RELEASE - IMPORTED_LOCATION_DEBUG - IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE - IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG - INTERFACE_LINK_LIBRARIES - INTERFACE_INCLUDE_DIRECTORIES - INTERFACE_COMPILE_DEFINITIONS) - set(CMAKE_INCLUDE_CURRENT_DIR ON) add_executable(atkmm WIN32 main.cpp) diff --git a/Tests/FindGTK2/cairo/CMakeLists.txt b/Tests/FindGTK2/cairo/CMakeLists.txt index 396ee94..97a7369 100644 --- a/Tests/FindGTK2/cairo/CMakeLists.txt +++ b/Tests/FindGTK2/cairo/CMakeLists.txt @@ -2,22 +2,8 @@ cmake_minimum_required(VERSION 2.8) project(cairo C) -message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) -set(CMAKE_VERBOSE_MAKEFILE 1) - find_package(GTK2 COMPONENTS gtk REQUIRED) -include(CMakePrintHelpers) -cmake_print_properties(TARGETS GTK2::cairo - PROPERTIES IMPORTED_CONFIGURATIONS - IMPORTED_LOCATION_RELEASE - IMPORTED_LOCATION_DEBUG - IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE - IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG - INTERFACE_LINK_LIBRARIES - INTERFACE_INCLUDE_DIRECTORIES - INTERFACE_COMPILE_DEFINITIONS) - set(CMAKE_INCLUDE_CURRENT_DIR ON) add_executable(cairo WIN32 main.c) diff --git
[Cmake-commits] CMake branch, next, updated. v2.8.12-3667-g4c76f79
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 4c76f7909f5015dfc025726a83b0517632f72288 (commit)
via 465aaa0fd7b1ea0cebb154cb4ab77d60d264ab45 (commit)
from 47465254bad0794ba5eb34dab78200ef7bc251fd (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=4c76f7909f5015dfc025726a83b0517632f72288
commit 4c76f7909f5015dfc025726a83b0517632f72288
Merge: 4746525 465aaa0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:48:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 10:48:12 2013 -0400
Merge topic 'FindGTK2-targets' into next
465aaa0 FindGTK2: Drop debugging message when a target dependency is missing
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=465aaa0fd7b1ea0cebb154cb4ab77d60d264ab45
commit 465aaa0fd7b1ea0cebb154cb4ab77d60d264ab45
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:44:26 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 10:44:26 2013 -0400
FindGTK2: Drop debugging message when a target dependency is missing
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 500cec7..9d8c41b 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -463,7 +463,7 @@ function(_GTK2_ADD_TARGET _var)
# Do not create the target if dependencies are missing
foreach(_dep ${_${_var}_GTK2_DEPENDS})
if(NOT TARGET GTK2::${_dep})
-message(WARNING FindGTK2: target GTK2::${_dep} not found
while creating target GTK2::${_basename})
+return()
endif()
endforeach()
---
Summary of changes:
Modules/FindGTK2.cmake |2 +-
1 files changed, 1 insertions(+), 1 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. v2.8.12-3695-ge576d82
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 e576d82760c1e30a6104d82cbe58e5dc7c874dea (commit)
via 1763c31c3b964343b88f8f26dc2941dd8c0e1fbe (commit)
via aa53ee57bb50faa3aa64e86cb58bbe2df6688335 (commit)
via ab65862417adc80dfb18170a6bd70889a24fe045 (commit)
from e35fb682062a879154e68184ea98fcadb386cce4 (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=e576d82760c1e30a6104d82cbe58e5dc7c874dea
commit e576d82760c1e30a6104d82cbe58e5dc7c874dea
Merge: e35fb68 1763c31
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:58:07 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 10:58:07 2013 -0400
Merge topic 'apple-clang-id' into next
1763c31 Set policy CMP0025 to NEW while building CMake itself
aa53ee5 Add policy CMP0025 for Apple Clang compiler id compatibility
ab65862 Clang: Add separate AppleClang compiler id
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1763c31c3b964343b88f8f26dc2941dd8c0e1fbe
commit 1763c31c3b964343b88f8f26dc2941dd8c0e1fbe
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Oct 2 14:45:54 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Oct 7 20:12:46 2013 -0400
Set policy CMP0025 to NEW while building CMake itself
CMake is aware of the policy's NEW behavior and the AppleClang compiler
id. Set the policy to NEW explicitly to avoid the warning and get the
NEW behavior.
Also teach the RunCMake test infrastructure to build tests with
-DCMAKE_POLICY_DEFAULT_CMP0025=NEW to avoid the policy warning
in test output that must match specific regular expressions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbbe08..77b4604 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,9 @@
#=
cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake = 2.8.4 is required
+if(POLICY CMP0025)
+ cmake_policy(SET CMP0025 NEW)
+endif()
project(CMake)
if(CMAKE_BOOTSTRAP)
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index 0f27836..a9d89d4 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -85,6 +85,9 @@
# written.
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+IF(POLICY CMP0025)
+ CMAKE_POLICY(SET CMP0025 NEW)
+ENDIF()
#-
# If a namespace is not specified, use kwsys and enable testing.
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 00faa4c..6e58d62 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -36,6 +36,9 @@ function(run_cmake test)
if(NOT DEFINED RunCMake_TEST_OPTIONS)
set(RunCMake_TEST_OPTIONS )
endif()
+ if(APPLE)
+list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW)
+ endif()
execute_process(
COMMAND ${CMAKE_COMMAND} ${RunCMake_TEST_SOURCE_DIR}
-G ${RunCMake_GENERATOR}
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 74a713d..abf04d8 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -1,4 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+IF(POLICY CMP0025)
+ CMAKE_POLICY(SET CMP0025 NEW)
+ENDIF()
PROJECT(LIBCURL C)
# Setup package meta-data
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa53ee57bb50faa3aa64e86cb58bbe2df6688335
commit aa53ee57bb50faa3aa64e86cb58bbe2df6688335
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Oct 2 14:10:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Oct 7 20:12:46 2013 -0400
Add policy CMP0025 for Apple Clang compiler id compatibility
The parent commit introduced a separate AppleClang compiler id for
Apple's Clang distribution. Add a policy in order to support projects
that expect this compiler's id to be just Clang. When the policy is
OLD or not set, map AppleClang back to Clang. Continue to use the
AppleClang id internally while enabling the language, but set the
CMAKE_LANG_COMPILER_ID after project() or enable_language() to the
compatible value for use by project code.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7f2b592..2c3834a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -616,6 +616,9 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
[Cmake-commits] CMake branch, master, updated. v2.8.12-122-g5c57fde
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 5c57fdedb19897880e5c13f9a0dd35ad4087565c (commit) via 1bbc7662ea2319e02322664b00ca645acde7f723 (commit) via d9eb277631afa5aa00b15d4a90bbd17b9ba754b6 (commit) via 675a4d3897d7838d1e9d0b876dd16e72afb9cd0d (commit) from 4340507207830c5d82ca59b2e82cddf6dbf8f36b (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=5c57fdedb19897880e5c13f9a0dd35ad4087565c commit 5c57fdedb19897880e5c13f9a0dd35ad4087565c Merge: 4340507 1bbc766 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 10:58:30 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 10:58:30 2013 -0400 Merge topic 'FindGTK2-quiet' 1bbc766 FindGTK2: Search for modules quietly when needed d9eb277 FindGTK2: Find freetype quietly 675a4d3 FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced --- Summary of changes: Modules/FindGTK2.cmake |5 - 1 files changed, 4 insertions(+), 1 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. v2.8.12-130-g5a6c151
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 5a6c15155cbf18de60e118700e3e778f796e213d (commit)
via 3d8356d486ae736d1ba151aedfeb928222e7a084 (commit)
via 51ab85c398319c074200ca51f37baa0e4c47ed7c (commit)
via be10826bf130d7568011ec3cf97355686c298dd3 (commit)
from f8241136b42c7e1064ca8764c6fa5e17012127da (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=5a6c15155cbf18de60e118700e3e778f796e213d
commit 5a6c15155cbf18de60e118700e3e778f796e213d
Merge: f824113 3d8356d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:58:56 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 10:58:56 2013 -0400
Merge topic 'clang-cl-compiler'
3d8356d Clang: Support Windows variants for GNU and MSVC (#13035, #14458)
51ab85c CMakeDetermineCompilerId: Add notion of simulated id/version
be10826 CMakeDetermineCompilerId: Fix local var init
---
Summary of changes:
Modules/CMakeCCompiler.cmake.in|2 +
Modules/CMakeCCompilerId.c.in | 15 +
Modules/CMakeCXXCompiler.cmake.in |2 +
Modules/CMakeCXXCompilerId.cpp.in | 15 +
Modules/CMakeDetermineCompilerId.cmake | 21 -
Modules/CMakeFindBinUtils.cmake|6 +++-
Modules/CMakePlatformId.h.in | 18 +++
Modules/Compiler/Clang-CXX.cmake |4 ++-
Modules/Compiler/Clang.cmake | 20 +++--
Modules/Platform/Windows-Clang-C.cmake |2 +
Modules/Platform/Windows-Clang-CXX.cmake |2 +
.../{Linux-GNU.cmake = Windows-Clang.cmake} | 23 +---
Modules/Platform/Windows-MSVC.cmake|8 +-
Source/cmDocumentVariables.cxx | 22 +++
14 files changed, 138 insertions(+), 22 deletions(-)
create mode 100644 Modules/Platform/Windows-Clang-C.cmake
create mode 100644 Modules/Platform/Windows-Clang-CXX.cmake
copy Modules/Platform/{Linux-GNU.cmake = Windows-Clang.cmake} (61%)
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. v2.8.12-126-gf824113
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 f8241136b42c7e1064ca8764c6fa5e17012127da (commit) via ce0c303d62941d2b10098b1ec00de3ced8556919 (commit) via 435c912848b08333e03c74439f725c9b96890d80 (commit) via fe732264e9abb6249d1d112b24ce36b226590105 (commit) from 5c57fdedb19897880e5c13f9a0dd35ad4087565c (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=f8241136b42c7e1064ca8764c6fa5e17012127da commit f8241136b42c7e1064ca8764c6fa5e17012127da Merge: 5c57fde ce0c303 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 10:58:40 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Oct 8 10:58:40 2013 -0400 Merge topic 'INTERFACE_LIBRARY-target-type' ce0c303 install: Teach EXPORT option to handle INTERFACE_LIBRARY targets 435c912 export: Add support for INTERFACE_LIBRARY targets fe73226 Add the INTERFACE_LIBRARY target type. diff --cc Source/cmLocalVisualStudio6Generator.cxx index f00a937,f0f47cb..a665b93 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@@ -146,8 -151,10 +151,10 @@@ void cmLocalVisualStudio6Generator::Out case cmTarget::GLOBAL_TARGET: this-SetBuildType(UTILITY, l-first.c_str(), l-second); break; + case cmTarget::INTERFACE_LIBRARY: + continue; default: -cmSystemTools::Error(Bad target type, l-first.c_str()); +cmSystemTools::Error(Bad target type: , l-first.c_str()); break; } // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace --- Summary of changes: Source/cmAddLibraryCommand.cxx | 40 +++- Source/cmAddLibraryCommand.h | 10 ++ Source/cmComputeLinkDepends.cxx|7 ++ Source/cmComputeLinkInformation.cxx|5 + Source/cmCoreTryCompile.cxx|1 + Source/cmExportBuildFileGenerator.cxx | 24 +++-- Source/cmExportCommand.cxx |3 +- Source/cmExportFileGenerator.cxx | 16 ++- Source/cmExportInstallFileGenerator.cxx| 19 +++- Source/cmGlobalGenerator.cxx |4 + Source/cmGlobalNinjaGenerator.cxx |7 +- Source/cmGlobalUnixMakefileGenerator3.cxx |8 ++ Source/cmGlobalVisualStudio6Generator.cxx |4 + Source/cmGlobalVisualStudio7Generator.cxx |4 + Source/cmGlobalVisualStudio8Generator.cxx |4 + Source/cmGlobalVisualStudioGenerator.cxx |4 + Source/cmGlobalXCodeGenerator.cxx | 25 - Source/cmInstallCommand.cxx|8 ++- Source/cmInstallTargetGenerator.cxx|5 + Source/cmLocalGenerator.cxx|8 ++ Source/cmLocalVisualStudio10Generator.cxx |4 + Source/cmLocalVisualStudio6Generator.cxx | 10 ++- Source/cmLocalVisualStudio7Generator.cxx | 12 ++- Source/cmMakefile.cxx |5 +- Source/cmMakefileTargetGenerator.cxx |7 +- Source/cmTarget.cxx| 111 +--- Source/cmTarget.h |1 + Source/cmTargetLinkLibrariesCommand.cxx| 14 +++ Source/cmTargetPropCommandBase.cxx |9 ++ Source/cmVisualStudio10TargetGenerator.cxx |8 ++- Tests/AliasTarget/CMakeLists.txt |3 + Tests/CMakeLists.txt |1 + Tests/CompatibleInterface/CMakeLists.txt |2 +- Tests/ExportImport/Export/CMakeLists.txt |2 + Tests/ExportImport/Export/Interface/CMakeLists.txt | 49 + .../Export/Interface/headeronly/headeronly.h |7 ++ Tests/ExportImport/Export/Interface/sharedlib.cpp |7 ++ .../Export/Interface/sharedlib/sharedlib.h |7 ++ Tests/ExportImport/Import/CMakeLists.txt |3 + Tests/ExportImport/Import/Interface/CMakeLists.txt | 55 ++ .../Import/Interface/headeronlytest.cpp| 17 +++ .../Import/Interface/interfacetest.cpp | 20 Tests/InterfaceLibrary/CMakeLists.txt | 15 +++ Tests/InterfaceLibrary/definetestexe.cpp |9 ++ Tests/InterfaceLibrary/libsdir/CMakeLists.txt | 26 + Tests/InterfaceLibrary/libsdir/shareddependlib.cpp |7 ++
[Cmake-commits] CMake branch, master, updated. v2.8.12-132-g40c8468
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 40c84683aafc9447a0e17d81a71d061efde84bdb (commit)
via 904ff9fe592882db5dae88e526db2b380d92f87d (commit)
from 5a6c15155cbf18de60e118700e3e778f796e213d (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=40c84683aafc9447a0e17d81a71d061efde84bdb
commit 40c84683aafc9447a0e17d81a71d061efde84bdb
Merge: 5a6c151 904ff9f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 10:59:07 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 10:59:07 2013 -0400
Merge topic 'export-policy'
904ff9f export: Add policy CMP0024 to disallow include() of export files
---
Summary of changes:
Source/cmExportCommand.cxx |2 +
Source/cmIncludeCommand.cxx| 39
Source/cmMakefile.h| 14 +++-
Source/cmPolicies.cxx | 19 ++
Source/cmPolicies.h|1 +
.../CMP0024-NEW-result.txt}|0
Tests/RunCMake/include/CMP0024-NEW-stderr.txt | 15
Tests/RunCMake/include/CMP0024-NEW.cmake |9 +
.../CMP0024-WARN-result.txt} |0
Tests/RunCMake/include/CMP0024-WARN-stderr.txt | 16
Tests/RunCMake/include/CMP0024-WARN.cmake |7
Tests/RunCMake/include/RunCMakeTest.cmake |2 +
Tests/RunCMake/{CMP0022 = include}/empty.cpp |0
13 files changed, 123 insertions(+), 1 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
include/CMP0024-NEW-result.txt} (100%)
create mode 100644 Tests/RunCMake/include/CMP0024-NEW-stderr.txt
create mode 100644 Tests/RunCMake/include/CMP0024-NEW.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-static-result.txt =
include/CMP0024-WARN-result.txt} (100%)
create mode 100644 Tests/RunCMake/include/CMP0024-WARN-stderr.txt
create mode 100644 Tests/RunCMake/include/CMP0024-WARN.cmake
copy Tests/RunCMake/{CMP0022 = include}/empty.cpp (100%)
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. v2.8.12-3700-g2f3e17d
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 2f3e17d73b5b1f5d4309dbff7a07e073435038ae (commit) via 40c84683aafc9447a0e17d81a71d061efde84bdb (commit) via 5a6c15155cbf18de60e118700e3e778f796e213d (commit) via f8241136b42c7e1064ca8764c6fa5e17012127da (commit) via 5c57fdedb19897880e5c13f9a0dd35ad4087565c (commit) from e576d82760c1e30a6104d82cbe58e5dc7c874dea (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=2f3e17d73b5b1f5d4309dbff7a07e073435038ae commit 2f3e17d73b5b1f5d4309dbff7a07e073435038ae Merge: e576d82 40c8468 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Oct 8 10:56:52 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Oct 8 10:56:52 2013 -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. v2.8.12-3703-g363a04f
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 363a04feb8bc3e7a3db33d2f1e6ae76c2d4a2eb9 (commit)
via 192a9182f8bbc533ed3f45372b7daaf5026054ed (commit)
via 46c7bcaf967f4bca31df08c247c4fcc6624c57b5 (commit)
from 2f3e17d73b5b1f5d4309dbff7a07e073435038ae (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=363a04feb8bc3e7a3db33d2f1e6ae76c2d4a2eb9
commit 363a04feb8bc3e7a3db33d2f1e6ae76c2d4a2eb9
Merge: 2f3e17d 192a918
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 11:10:51 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 11:10:51 2013 -0400
Merge topic 'blas-windows' into next
192a918 FindLAPACK: MKL clean up and fix for windows
46c7bca FindBLAS: Fixes for Windows MKL support
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=192a9182f8bbc533ed3f45372b7daaf5026054ed
commit 192a9182f8bbc533ed3f45372b7daaf5026054ed
Author: Leszek Swirski les...@swirski.co.uk
AuthorDate: Tue Oct 8 15:47:42 2013 +0100
Commit: Leszek Swirski les...@swirski.co.uk
CommitDate: Tue Oct 8 16:07:43 2013 +0100
FindLAPACK: MKL clean up and fix for windows
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 3167850..fecadeb 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -229,57 +229,61 @@ if (BLA_VENDOR MATCHES Intel* OR BLA_VENDOR STREQUAL
All)
else()
find_package(Threads REQUIRED)
endif()
+
+set(LAPACK_SEARCH_LIBS )
+
if (BLA_F95)
- if(NOT LAPACK95_LIBRARIES)
-# old
-check_lapack_libraries(
- LAPACK95_LIBRARIES
- LAPACK
- cheev
-
- mkl_lapack95
- ${BLAS95_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT};${LM}
- )
- endif()
- if(NOT LAPACK95_LIBRARIES)
-# new = 10.3
-check_lapack_libraries(
- LAPACK95_LIBRARIES
- LAPACK
- CHEEV
-
- mkl_intel_lp64
- ${BLAS95_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT};${LM}
- )
- endif()
+ set(LAPACK_mkl_SEARCH_SYMBOL CHEEV)
+ set(_LIBRARIES LAPACK95_LIBRARIES)
+ set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
+
+ # old
+ list(APPEND LAPACK_SEARCH_LIBS
+mkl_lapack95)
+ # new = 10.3
+ list(APPEND LAPACK_SEARCH_LIBS
+mkl_intel_c)
+ list(APPEND LAPACK_SEARCH_LIBS
+mkl_intel_lp64)
else()
- if(NOT LAPACK_LIBRARIES)
-# old
-check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
-
- mkl_lapack
- ${BLAS_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT};${LM}
- )
- endif()
- if(NOT LAPACK_LIBRARIES)
-# new = 10.3
+ set(LAPACK_mkl_SEARCH_SYMBOL cheev)
+ set(_LIBRARIES LAPACK_LIBRARIES)
+ set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
+
+ # old
+ list(APPEND LAPACK_SEARCH_LIBS
+mkl_lapack)
+ # new = 10.3
+ list(APPEND LAPACK_SEARCH_LIBS
+mkl_gf_lp64)
+endif()
+
+# First try empty lapack libs
+if (NOT ${_LIBRARIES})
+ check_lapack_libraries(
+${_LIBRARIES}
+BLAS
+${LAPACK_mkl_SEARCH_SYMBOL}
+
+
+${_BLAS_LIBRARIES}
+${CMAKE_THREAD_LIBS_INIT};${LM}
+)
+endif ()
+# Then try the search libs
+foreach (IT ${LAPACK_SEARCH_LIBS})
+ if (NOT ${_LIBRARIES})
check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
+ ${_LIBRARIES}
+ BLAS
+ ${LAPACK_mkl_SEARCH_SYMBOL}
- mkl_gf_lp64
- ${BLAS_LIBRARIES}
+ ${IT}
+ ${_BLAS_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT};${LM}
)
- endif()
-endif()
+ endif ()
+endforeach ()
endif ()
endif()
else()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46c7bcaf967f4bca31df08c247c4fcc6624c57b5
commit 46c7bcaf967f4bca31df08c247c4fcc6624c57b5
Author: Leszek Swirski les...@swirski.co.uk
AuthorDate: Tue Oct 8 15:00:12 2013 +0100
Commit: Leszek Swirski les...@swirski.co.uk
CommitDate: Tue Oct 8 15:00:12 2013 +0100
FindBLAS: Fixes for Windows MKL support
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index f8a284d..8bb83d9 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -469,8 +469,45 @@ if (BLA_VENDOR MATCHES Intel* OR BLA_VENDOR STREQUAL
All)
set(BLAS_mkl_SEARCH_SYMBOL SGEMM)
set(_LIBRARIES BLAS95_LIBRARIES)
if (WIN32)
- list(APPEND
[Cmake-commits] CMake branch, next, updated. v2.8.12-3708-g48599d0
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 48599d068041afce8fa3b8ea643c6d90fff36a43 (commit)
via ce62aa257d604948bcc547fcf900c71073a5 (commit)
via 509c142a3f5ae4c1aa8dfcb4257c63a9e1edc270 (commit)
from 861bc9194d3e440e631d42edee08e45bffe201d9 (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=48599d068041afce8fa3b8ea643c6d90fff36a43
commit 48599d068041afce8fa3b8ea643c6d90fff36a43
Merge: 861bc91 ce62aa2
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Oct 8 12:12:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 12:12:30 2013 -0400
Merge topic 'deprecation-message' into next
ce62aa2 Qt4Macros: Port to use message(DEPRECATION)
509c142 message: Add a DEPRECATION mode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce62aa257d604948bcc547fcf900c71073a5
commit ce62aa257d604948bcc547fcf900c71073a5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Sep 17 19:11:39 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Oct 8 18:11:22 2013 +0200
Qt4Macros: Port to use message(DEPRECATION)
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f1aedd7..bb5d011 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -355,15 +355,7 @@ endmacro()
macro(QT4_AUTOMOC)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The qt4_automoc macro is obsolete. Use the
CMAKE_AUTOMOC feature instead.)
-endif()
+message(DEPRECATION The qt4_automoc macro is obsolete. Use the
CMAKE_AUTOMOC feature instead.)
endif()
QT4_GET_MOC_FLAGS(_moc_INCS)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
index 6f7e8ee..f358cc4 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
Call Stack \(most recent call first\):
AutomocMacro-WARN.cmake:7 \(qt4_automoc\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=509c142a3f5ae4c1aa8dfcb4257c63a9e1edc270
commit 509c142a3f5ae4c1aa8dfcb4257c63a9e1edc270
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Sep 17 18:54:34 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Oct 8 18:11:22 2013 +0200
message: Add a DEPRECATION mode
By default, the message is not issued. If CMAKE_ERROR_DEPRECATED
is on, the message is fatal. If CMAKE_WARN_DEPRECATED is on, the
message is a warning.
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index e1dbf34..d85e720 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -52,6 +52,23 @@ bool cmMessageCommand
status = true;
++i;
}
+ else if (*i == DEPRECATION)
+{
+if (this-Makefile-IsOn(CMAKE_ERROR_DEPRECATED))
+ {
+ fatal = true;
+ type = cmake::DEPRECATION_ERROR;
+ }
+else if (this-Makefile-IsOn(CMAKE_WARN_DEPRECATED))
+ {
+ type = cmake::DEPRECATION_WARNING;
+ }
+else
+ {
+ return true;
+ }
+++i;
+}
for(;i != args.end(); ++i)
{
diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h
index fc61810..a053bdd 100644
--- a/Source/cmMessageCommand.h
+++ b/Source/cmMessageCommand.h
@@ -60,9 +60,8 @@ public:
virtual const char* GetFullDocumentation() const
{
return
-message([STATUS|WARNING|AUTHOR_WARNING|FATAL_ERROR|SEND_ERROR]\n
-\message to display\ ...)\n
- The optional keyword determines the type of message:\n
+message([mode] \message to display\ ...)\n
+ The optional mode keyword determines the type of message:\n
(none) = Important information\n
STATUS = Incidental information\n
WARNING= CMake Warning, continue processing\n
@@ -70,6 +69,9 @@ public:
SEND_ERROR = CMake Error, continue processing,\n
but skip generation\n
FATAL_ERROR= CMake Error, stop processing and generation\n
+DEPRECATION
[Cmake-commits] CMake branch, next, updated. v2.8.12-3711-gfc35df7
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 fc35df70f29a4a92611431b466c7152167697dd7 (commit)
via 2ee00edb278e4e84e54fe52e406184231359c8cc (commit)
via 415f9fca57421191992c502c6a36c45b076a7309 (commit)
from 48599d068041afce8fa3b8ea643c6d90fff36a43 (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=fc35df70f29a4a92611431b466c7152167697dd7
commit fc35df70f29a4a92611431b466c7152167697dd7
Merge: 48599d0 2ee00ed
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Oct 8 12:22:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 12:22:30 2013 -0400
Merge topic 'deprecation-message' into next
2ee00ed GenerateExportHeader: Port to use message(DEPRECATION)
415f9fc Use new DEPRECTATION message type.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ee00edb278e4e84e54fe52e406184231359c8cc
commit 2ee00edb278e4e84e54fe52e406184231359c8cc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Oct 8 18:14:21 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Oct 8 18:21:02 2013 +0200
GenerateExportHeader: Port to use message(DEPRECATION)
diff --git a/Modules/GenerateExportHeader.cmake
b/Modules/GenerateExportHeader.cmake
index b2fda09..fb113a7 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -337,15 +337,7 @@ endfunction()
function(add_compiler_export_flags)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The add_compiler_export_flags function is
obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target
properties instead.)
-endif()
+message(DEPRECATION The add_compiler_export_flags function is obsolete.
Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties
instead.)
endif()
_test_compiler_hidden_visibility()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=415f9fca57421191992c502c6a36c45b076a7309
commit 415f9fca57421191992c502c6a36c45b076a7309
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Oct 8 18:12:53 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Oct 8 18:21:02 2013 +0200
Use new DEPRECTATION message type.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index bb5d011..74bad89 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -468,15 +468,7 @@ endmacro()
function(qt4_use_modules _target _link_type)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The qt4_use_modules function is obsolete. Use
target_link_libraries with IMPORTED targets instead.)
-endif()
+message(DEPRECATION The qt4_use_modules function is obsolete. Use
target_link_libraries with IMPORTED targets instead.)
endif()
if (${_link_type} STREQUAL LINK_PUBLIC OR ${_link_type} STREQUAL
LINK_PRIVATE)
set(modules ${ARGN})
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
index b90c665..c69af65 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_use_modules function is obsolete. Use target_link_libraries with
IMPORTED targets instead.
Call Stack \(most recent call first\):
---
Summary of changes:
Modules/GenerateExportHeader.cmake | 10 +-
Modules/Qt4Macros.cmake| 10 +-
.../UseModulesMacro-WARN-stderr.txt|2 +-
3 files changed, 3 insertions(+), 19 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. v2.8.12-3714-gc92ced8
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 c92ced87277375154760873b1b7949235b035855 (commit)
via f973737305aaa48ddf26f4455bdc8acdd7d03573 (commit)
via f69606d3354701c2e4ef4ed0718802e1fa6b7fd5 (commit)
from fc35df70f29a4a92611431b466c7152167697dd7 (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=c92ced87277375154760873b1b7949235b035855
commit c92ced87277375154760873b1b7949235b035855
Merge: fc35df7 f973737
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Oct 8 12:24:13 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 12:24:13 2013 -0400
Merge topic 'deprecation-message' into next
f973737 GenerateExportHeader: Port to use message(DEPRECATION)
f69606d Qt4Macros: Port to use message(DEPRECATION)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f973737305aaa48ddf26f4455bdc8acdd7d03573
commit f973737305aaa48ddf26f4455bdc8acdd7d03573
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Oct 8 18:14:21 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Oct 8 18:23:42 2013 +0200
GenerateExportHeader: Port to use message(DEPRECATION)
diff --git a/Modules/GenerateExportHeader.cmake
b/Modules/GenerateExportHeader.cmake
index b2fda09..fb113a7 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -337,15 +337,7 @@ endfunction()
function(add_compiler_export_flags)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The add_compiler_export_flags function is
obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target
properties instead.)
-endif()
+message(DEPRECATION The add_compiler_export_flags function is obsolete.
Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties
instead.)
endif()
_test_compiler_hidden_visibility()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f69606d3354701c2e4ef4ed0718802e1fa6b7fd5
commit f69606d3354701c2e4ef4ed0718802e1fa6b7fd5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Sep 17 19:11:39 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Oct 8 18:23:42 2013 +0200
Qt4Macros: Port to use message(DEPRECATION)
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f1aedd7..74bad89 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -355,15 +355,7 @@ endmacro()
macro(QT4_AUTOMOC)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The qt4_automoc macro is obsolete. Use the
CMAKE_AUTOMOC feature instead.)
-endif()
+message(DEPRECATION The qt4_automoc macro is obsolete. Use the
CMAKE_AUTOMOC feature instead.)
endif()
QT4_GET_MOC_FLAGS(_moc_INCS)
@@ -476,15 +468,7 @@ endmacro()
function(qt4_use_modules _target _link_type)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
-if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
-endif()
-if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
-endif()
-if(messageType)
- message(${messageType} The qt4_use_modules function is obsolete. Use
target_link_libraries with IMPORTED targets instead.)
-endif()
+message(DEPRECATION The qt4_use_modules function is obsolete. Use
target_link_libraries with IMPORTED targets instead.)
endif()
if (${_link_type} STREQUAL LINK_PUBLIC OR ${_link_type} STREQUAL
LINK_PRIVATE)
set(modules ${ARGN})
diff --git a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
index 6f7e8ee..f358cc4 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
Call Stack \(most recent call first\):
AutomocMacro-WARN.cmake:7 \(qt4_automoc\)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
[Cmake-commits] CMake branch, next, updated. v2.8.12-3716-g1e1e272
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 1e1e272d3aac3262d49d045678f7fb1ecfa54ec1 (commit)
via dcf1b645691a1d31cbbad78a9c6c9dca8d472346 (commit)
from c92ced87277375154760873b1b7949235b035855 (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=1e1e272d3aac3262d49d045678f7fb1ecfa54ec1
commit 1e1e272d3aac3262d49d045678f7fb1ecfa54ec1
Merge: c92ced8 dcf1b64
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 12:36:49 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 12:36:49 2013 -0400
Merge topic 'osx-cmake-app-info-plist' into next
dcf1b64 OS X: Set CMake.app bundle Info.plist fields (#11694)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf1b645691a1d31cbbad78a9c6c9dca8d472346
commit dcf1b645691a1d31cbbad78a9c6c9dca8d472346
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 12:32:28 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 12:32:28 2013 -0400
OS X: Set CMake.app bundle Info.plist fields (#11694)
Use the Apple Info.plist reference documentation:
Core Foundation Keys
https://developer.apple.com/library/mac/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
Launch Services Keys
https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html
Cocoa Keys
https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html
modify the Info.plist we create for cmake-gui to add/set fields
CFBundleShortVersionString = The release-version-number string
LSApplicationCategoryType = UTI that categorizes the app for the App Store
NSHumanReadableCopyright = Specifies the copyright notice
and drop fields
CFBundleGetInfoString
CFBundleLongVersionString
LSRequiresCarbon
Also prepare to set
CFBundleVersion= The build-version-number string
but leave it commented out as TBD (To Be Determined) for now.
The version fields must have form major.minor.patch with integer
components. While at it, rename the bundle to end in .patch instead
of -patch so that it is consistent with the version number and does
not look like a packaging increment suffix.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbbe08..3ff65d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -529,8 +529,9 @@ endif()
if(BUILD_QtDialog)
if(APPLE)
-set(CMAKE_BUNDLE_NAME
- CMake
${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH})
+set(CMAKE_BUNDLE_VERSION
+ ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH})
+set(CMAKE_BUNDLE_NAME CMake ${CMAKE_BUNDLE_VERSION})
set(CMAKE_BUNDLE_LOCATION ${CMAKE_INSTALL_PREFIX})
# make sure CMAKE_INSTALL_PREFIX ends in /
string(LENGTH ${CMAKE_INSTALL_PREFIX} LEN)
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index ef25294..15f9ef1 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -112,7 +112,12 @@ endif()
if(APPLE)
set_target_properties(cmake-gui PROPERTIES
-OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+OUTPUT_NAME ${CMAKE_BUNDLE_NAME}
+MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
+MACOSX_BUNDLE_SHORT_VERSION_STRING ${CMAKE_BUNDLE_VERSION}
+# TBD: MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_BUNDLE_VERSION}
+MACOSX_BUNDLE_COPYRIGHT Copyright 2000-2013 Kitware, Inc.
+)
endif()
set(CMAKE_INSTALL_DESTINATION_ARGS
BUNDLE DESTINATION ${CMAKE_BUNDLE_LOCATION})
diff --git a/Source/QtDialog/Info.plist.in b/Source/QtDialog/Info.plist.in
new file mode 100644
index 000..b9c4af5
--- /dev/null
+++ b/Source/QtDialog/Info.plist.in
@@ -0,0 +1,32 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE plist PUBLIC -//Apple Computer//DTD PLIST 1.0//EN
http://www.apple.com/DTDs/PropertyList-1.0.dtd;
+plist version=1.0
+dict
+ keyCFBundleDevelopmentRegion/key
+ stringEnglish/string
+ keyCFBundleExecutable/key
+ string${MACOSX_BUNDLE_EXECUTABLE_NAME}/string
+ keyCFBundleIconFile/key
+ string${MACOSX_BUNDLE_ICON_FILE}/string
+ keyCFBundleIdentifier/key
+ string${MACOSX_BUNDLE_GUI_IDENTIFIER}/string
+ keyCFBundleInfoDictionaryVersion/key
+ string6.0/string
+ keyCFBundleName/key
+ string${MACOSX_BUNDLE_BUNDLE_NAME}/string
+
[Cmake-commits] CMake branch, next, updated. v2.8.12-3718-ge14ebc0
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 e14ebc0876bda8f3e625699cd262ee7d86a5a12e (commit)
via 7f459a664cdb74693af2e0ec4cfd3d1c46b21b76 (commit)
from 1e1e272d3aac3262d49d045678f7fb1ecfa54ec1 (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=e14ebc0876bda8f3e625699cd262ee7d86a5a12e
commit e14ebc0876bda8f3e625699cd262ee7d86a5a12e
Merge: 1e1e272 7f459a6
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 14:23:13 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 8 14:23:13 2013 -0400
Merge topic 'xcode-5-no-BuildDepends-help' into next
7f459a6 Xcode: Teach BuildDepends test that Xcode = 5 needs no help
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f459a664cdb74693af2e0ec4cfd3d1c46b21b76
commit 7f459a664cdb74693af2e0ec4cfd3d1c46b21b76
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Oct 8 14:21:25 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Oct 8 14:21:25 2013 -0400
Xcode: Teach BuildDepends test that Xcode = 5 needs no help
Drop the HELP_XCODE workarounds needed on older Xcode versions when
using Xcode = 5. We now expect builds and rebuilds to work using
proper dependencies with no special help.
diff --git a/Tests/BuildDepends/CMakeLists.txt
b/Tests/BuildDepends/CMakeLists.txt
index 0687154..9727930 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -13,7 +13,7 @@ project(BuildDepends)
set(CMAKE_SUPPRESS_REGENERATION 1)
# Xcode needs some help with the fancy dependencies in this test.
-if(${CMAKE_GENERATOR} MATCHES Xcode)
+if(XCODE AND XCODE_VERSION VERSION_LESS 5)
set(HELP_XCODE 1)
endif()
function(help_xcode_depends)
---
Summary of changes:
Tests/BuildDepends/CMakeLists.txt |2 +-
1 files changed, 1 insertions(+), 1 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. v2.8.12-133-g7f268c2
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 7f268c243f49775bb6de867ee49f3b48117c68ea (commit) from 40c84683aafc9447a0e17d81a71d061efde84bdb (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=7f268c243f49775bb6de867ee49f3b48117c68ea commit 7f268c243f49775bb6de867ee49f3b48117c68ea Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Oct 9 00:01:16 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Oct 9 00:01:16 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e4efb51..6298218 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) -set(CMake_VERSION_TWEAK 20131008) +set(CMake_VERSION_TWEAK 20131009) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
