Re: [cmake-developers] GenerateExportHeader macro in CMake?
Stephen, The test you recently added is failing on many platforms on the CMake dashboard today. Are you working on resolving these test failures? This output: *** Exception executing: Exit code 0xc135 means that one of the dlls could not be loaded properly by the built executable. Are you putting the dlls in the same directory with the executables by setting CMAKE_RUNTIME_OUTPUT_DIR ... ? Do you have a Windows machine with Visual Studio on it for local testing? Thanks, David On Tue, Aug 2, 2011 at 9:38 AM, Brad King brad.k...@kitware.com wrote: On 8/2/2011 3:40 AM, Stephen Kelly wrote: Brad King wrote: I've now also tested with MSVC and MinGW on Windows. I couldn't seem to get cmake to work on cygwin though. I'll see if I can test on Mac too before pushing to the cmake repo. One question I have is: Will the unit tests for this be run on all platforms before it gets to master? Yes. You will create a topic branch starting from 'master' but it will initially be merged into 'next' for testing. If there are failures you will be able to extend the topic with corresponding fixes. Only after the whole topic is mature will upstream developers merge it to 'master'. Thanks, -Brad __**_ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-**bin/mailman/listinfo/cmake-**developershttp://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] GenerateExportHeader macro in CMake?
Make that CMAKE_RUNTIME_OUTPUT_DIRECTORY ... On Wed, Aug 10, 2011 at 1:58 PM, David Cole david.c...@kitware.com wrote: Stephen, The test you recently added is failing on many platforms on the CMake dashboard today. Are you working on resolving these test failures? This output: *** Exception executing: Exit code 0xc135 means that one of the dlls could not be loaded properly by the built executable. Are you putting the dlls in the same directory with the executables by setting CMAKE_RUNTIME_OUTPUT_DIR ... ? Do you have a Windows machine with Visual Studio on it for local testing? Thanks, David On Tue, Aug 2, 2011 at 9:38 AM, Brad King brad.k...@kitware.com wrote: On 8/2/2011 3:40 AM, Stephen Kelly wrote: Brad King wrote: I've now also tested with MSVC and MinGW on Windows. I couldn't seem to get cmake to work on cygwin though. I'll see if I can test on Mac too before pushing to the cmake repo. One question I have is: Will the unit tests for this be run on all platforms before it gets to master? Yes. You will create a topic branch starting from 'master' but it will initially be merged into 'next' for testing. If there are failures you will be able to extend the topic with corresponding fixes. Only after the whole topic is mature will upstream developers merge it to 'master'. Thanks, -Brad __**_ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-**bin/mailman/listinfo/cmake-**developershttp://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0012396]: CDash should indicate the git hash of builds
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=12396 == Reported By:Stephen Kelly Assigned To: == Project:CMake Issue ID: 12396 Category: CTest Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2011-08-10 16:38 EDT Last Modified: 2011-08-10 16:38 EDT == Summary:CDash should indicate the git hash of builds Description: It should be possible to see in build reports such as http://www.cdash.org/CDash/testDetails.php?test=109040029build=1418444 which hash was built to get the result. Otherwise it is difficult to know if a recent commit fixed it, but the recent build was started after the commit. == Issue History Date ModifiedUsername FieldChange == 2011-08-10 16:38 Stephen Kelly New Issue == ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] GenerateExportHeader macro in CMake?
I worked with Stephen today on this and it needs to put all the dll's in the same place as the main executable. The following makes the test pass on my windows box: diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportH index 6374087..0f5d792 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -40,6 +40,8 @@ macro(_do_build Include Library LibrarySource Source) set(CMAKE_INCLUDE_CURRENT_DIR ON)\n +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \${GenerateExportHeader_BINARY_DIR}\)\n + include(GenerateExportHeader)\n add_compiler_export_flags()\n Can you or Brad push this to the branch? -Bill On 8/10/2011 1:58 PM, David Cole wrote: Stephen, The test you recently added is failing on many platforms on the CMake dashboard today. Are you working on resolving these test failures? This output: *** Exception executing: Exit code 0xc135 means that one of the dlls could not be loaded properly by the built executable. Are you putting the dlls in the same directory with the executables by setting CMAKE_RUNTIME_OUTPUT_DIR ... ? Do you have a Windows machine with Visual Studio on it for local testing? Thanks, David On Tue, Aug 2, 2011 at 9:38 AM, Brad King brad.k...@kitware.com mailto:brad.k...@kitware.com wrote: On 8/2/2011 3:40 AM, Stephen Kelly wrote: Brad King wrote: I've now also tested with MSVC and MinGW on Windows. I couldn't seem to get cmake to work on cygwin though. I'll see if I can test on Mac too before pushing to the cmake repo. One question I have is: Will the unit tests for this be run on all platforms before it gets to master? Yes. You will create a topic branch starting from 'master' but it will initially be merged into 'next' for testing. If there are failures you will be able to extend the topic with corresponding fixes. Only after the whole topic is mature will upstream developers merge it to 'master'. Thanks, -Brad _ cmake-developers mailing list cmake-developers@cmake.org mailto:cmake-developers@cmake.org http://public.kitware.com/cgi-__bin/mailman/listinfo/cmake-__developers http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Bill Hoffman Kitware, Inc. 28 Corporate Drive Clifton Park, NY 12065 bill.hoff...@kitware.com http://www.kitware.com 518 881-4905 (Direct) 518 371-3971 x105 Fax (518) 371-4573 ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0012397]: It is not clear how to report CDash bugs
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=12397 == Reported By:Stephen Kelly Assigned To: == Project:CMake Issue ID: 12397 Category: Development Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2011-08-10 17:28 EDT Last Modified: 2011-08-10 17:28 EDT == Summary:It is not clear how to report CDash bugs Description: On this page: http://public.kitware.com/Bug/bug_report_page.php the Category combobox does not contain an entry for CDash. It seems to be possible to change the project field to CDash, but I do not seem to have the karma to do that. == Issue History Date ModifiedUsername FieldChange == 2011-08-10 17:28 Stephen Kelly New Issue == ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] .S files and assembler
Hi, in http://www.cmake.org/pipermail/cmake/2009-November/033346.html I found the line: If the file (.S) needs to be preprocessed, set the LANGUAGE source file property to C, this should work in most cases for now. Is this still the way to process .S-files. In 2009 it sounded so temporary. And if so, where is it documented? Greetings Micha ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] append command
On Tue, Aug 9, 2011 at 3:34 PM, Alan W. Irwin ir...@beluga.phys.uvic.ca wrote: On 2011-08-09 17:19+0100 Glenn Coombs wrote: Probably too late now and there isn't a bug filed so far as I know, but one thing I would love to see added to cmake is an append command so that lines like this: set(CMAKE_EXE_LINKER_FLAGS_RELEASE ${CMAKE_EXE_LINKER_FLAGS_RELEASE} /INCREMENTAL:NO) become shorter and easier to understand: append(CMAKE_EXE_LINKER_FLAGS_RELEASE /INCREMENTAL:NO) The existing syntax for the set command is just ugly when appending. I know you can define a macro or function to do this but I just feel that it should be supported out of the box as it would make CMakeLists.txt files more readable. Hi Glenn: I am changing the subject line to keep discussion out of the bugfix thread as requested by Dave. It appears what you want is the list APPEND command for blank-delimited strings. But then later someone will want to add other parts of the list functionality to blank-delimited strings as well such as removing items from the blank-delimited list. Until you have two parallel list systems, one for blank delimited strings and one for semicolon-delimited strings (i.e., the current lists). I think most would reject the idea of having two parallel list systems with different delimiters so here is one possibility. For now just stick to list functionality, e.g., list(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE /INCREMENTAL:NO) and then change the semicolon delimiters to blanks using strings(REGEX REPLACE ...) once you have the list completely assembled. Of course, that will not work for the corner case where the strings contain semicolons. So in the long term, the right thing to do with lists might be to allow a choice of delimiter if you could do that in such a way as to preserve backwards compatibility. Alan __ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __ Linux-powered Science __ The APPEND_STRING arg was recently added to the CMake command set_property, because of a similar complaint about the APPEND arg with properties that are typically space separated. I'm not sure if an APPEND_STRING arg belongs in the set command, though... I understand that a line like this: set(CMAKE_EXE_LINKER_FLAGS_RELEASE ${CMAKE_EXE_LINKER_FLAGS_RELEASE} /INCREMENTAL:NO) is visually too long because we use verbose variable naming, but it is clear what it's doing, and it does work in all prior CMake versions... I tend toward keeping things as they are unless there's a strong consensus that an addition like this would really improve things for most CMake users. Anybody else listening in here have an opinion? Thanks, David ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Weird behaviour with CPackComponent and NSIS
On Tue, Aug 9, 2011 at 6:11 PM, Mathias Gaunard mathias.gaun...@ens-lyon.org wrote: I've recently upgraded to CMake 2.8.5 to try out the new CPack/CPackComponent separation, which allows me to include CPackComponent to get the various cpack component macros, but only include CPack later. I end up with very strange things happening, which I haven't been able to debug. What I did, is that instead of including CPack at the beginning of my project, I included CPackComponent instead, and included CPack at the end. I want to be able to do this so that I can use CPACK_NSIS_EXTRA_INSTALL_COMMANDS, among others. For some unknown reason, some of my components end up flagged as downloadable, and when I run cpack it then fails because I don't have the NSIS plugin to support this. If I unset the CPACK_COMPONENT_MYCOMPONENT_DOWNLOADABLE, then it doesn't happen, but the files from that component do not get installed. This is especially strange because it only affects some components but not others. I have a fairly complicated CMake project with a lot of add_subdirectory and recursive functions that include files, so I wonder if it doesn't get confused by the scoping somehow. Are there any known problems with the new CPackComponent approach? ___ 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://www.cmake.org/mailman/listinfo/cmake Nothing known (that I know of), but it's not surprising given the complexity that you describe. Is there a less complex case that we can use to reproduce the problem? Or can we see your complex case? (i.e. -- is it publicly available?) Thanks, David ___ 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Unable to locate boost_unit_test_framework-vc90-mt-gd-1_45.lib
I am having a problem setting up CMake to find the Boost unit test framework library when building a test program. In the top level CMakeLists.txt file I have: ENABLE_TESTING() add_subdirectory ( path/to/test ) In the test directory CMakeLists.txt file I have: LINK_DIRECTORIES ( ${Boost_LIBRARY_DIRS} ) ADD_EXECUTABLE ( test test.cpp ) ADD_TEST ( test ${CMAKE_CURRENT_BINARY_DIR}/test ) I added the LINK_DIRECTORIES because I though that the linker was not getting the path to the Boost library. That is wrong since the full path to the library is in the properties for this project. So I figured since it had the full name it should be able to find it. Not quite. The error message I get says: LNK1104: cannot open file 'boost_unit_test_framework-vc90-mt-gd-1_45.lib' I have boost installed in C:\boost. The FIND_BOOST macro able to find the installation headers and libraries I require. The only thing that is different is that the directory has the Boost unit test framework named as: C:\boost\lib\libboost_unit_test_framework-vc90-mt-gd-1_45.lib That name, libboost_unit_test, is different from the expected name of boost_unit_test... I am at a loss as to why this is the case. CMake version: 2.8.4 Boost version: 1.45 Stephen ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] include directories,
Hi All, Can somebody please advise me with this topic, if it is expected behaviour or a bug? thanks in advance Lukasz 2011/8/4 Łukasz Tasz luk...@tasz.eu: Hi All, I have a question according include_directories() function and INCLUDE_DIRECTORIES directory property. Is it possible that I will know set of include directories that will be used by preprocessor when I'm calling add_executable function? I notticed, that order does not matter, for example: add_library(test test.cxx) include_directories(${CMAKE_CURRENT_SOURCE_DIR}libtest) add_library(test1 test1.cxx) both targets will have the same include directories. so from CMake phase I'm not able to check what will be includes configuration, INCLUDE_DIRECTORIES property contain only current one. is this expected behaviour or this can be tuned by setting some policy? thanks in advance Lukasz Tasz -- Lukasz Tasz -- Lukasz Tasz ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] exclude build project from solution
Looks to me like the one chunk of code that actually refers to the target property: if(target-GetPropertyAsBool(EXCLUDE_FROM_DEFAULT_BUILD)) { return false; } should be changed to: if(target-GetPropertyAsBool(EXCLUDE_FROM_DEFAULT_BUILD) || target-GetPropertyAsBool(EXCLUDE_FROM_ALL)) { return false; } The EXCLUDE_FROM_DEFAULT_BUILD reference has been there since Nov. 2006 in this commit by Bill: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0bc59f7 EXCLUDE_FROM_ALL is referenced in many, many more places in the code, but the intent behind the properties seems (to me) to be identical. We'll see if Bill or Brad objects to this or has additional input :-) David On Tue, Aug 9, 2011 at 8:09 PM, Johan Björk p...@spotify.com wrote: Dave, Bill? Anyone know what the difference is intended to be between EXLUDE_FROM_ALL vs EXCLUDE_FROM_DEFAULT_BUILD? /Johan On Mon, Aug 1, 2011 at 6:57 PM, Johan Björk p...@spotify.com wrote: And another update while at it. The following cmake file illustrates the issue: FILE(WRITE foo.c ) add_library(foo EXCLUDE_FROM_ALL foo.c) set_target_properties(foo PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1) FILE(WRITE foobar.c ) add_executable(foobar foobar.c) target_link_libraries(foobar foo) This works fine in the makefile (and xcode) generator, but fails in MSVC 2008 with 1-- Skipped Build: Project: foo, Configuration: Debug Win32 -- 1Project not selected to build for this solution configuration 2-- Build started: Project: foobar, Configuration: Debug Win32 -- 2Compiling... 2foobar.c 2Compiling manifest to resources... 2Microsoft (R) Windows (R) Resource Compiler Version 6.0.5724.0 2Copyright (C) Microsoft Corporation. All rights reserved. 2Linking... 2LINK : fatal error LNK1104: cannot open file 'Debug\foo.lib' 2Build log was saved at file://c:\Users\Felix Bruns\Documents\Visual Studio 2008\Projects\a'\foobar.dir\Debug\BuildLog.htm 2foobar - 1 error(s), 0 warning(s) 3-- Skipped Build: Project: ALL_BUILD, Configuration: Debug Win32 -- 3Project not selected to build for this solution configuration == Build: 0 succeeded, 1 failed, 1 up-to-date, 2 skipped == I'll file a bug. On Mon, Aug 1, 2011 at 5:15 PM, Johan Björk p...@spotify.com wrote: and I just found The EXCLUDE_FROM_DEFAULT_BUILD property is used by the visual studio generators. If it is set to 1 the target will not be part of the default build when you select Build Solution. Anyone know why it is different from EXLUDE_FROM_ALL ? -Johan On Mon, Aug 1, 2011 at 5:05 PM, Johan Björk p...@spotify.com wrote: Hi all, Anyone know anything about this? I'm seeing the same issue with MSVC 2008 + cmake 2.8(.?) add_library(foo .. EXCLUDE_FROM_ALL ..) -Johan On Tue, May 3, 2011 at 4:59 PM, Andrea Galeazzi galea...@korg.it wrote: I've a project made up of multiple executable target: add_executable(TARGET_NAME1 ${SOURCES1}) add_executable(TARGET_NAME2 ${SOURCES2}) add_executable(TARGET_NAME3 ${SOURCES3}) ... Now I'd like to build just only TARGET_NAME1 when I press F7 (build solution) in visual studio. I tried to add set_target_properties(TARGET_NAME2 PROPERTIES EXCLUDE_FROM_ALL TRUE) set_target_properties(TARGET_NAME3 PROPERTIES EXCLUDE_FROM_ALL TRUE) .. but it only remove the dependency from ALL_BUILD project. So, is it possible to generate a such kind of solution? ___ 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://www.cmake.org/mailman/listinfo/cmake ___ 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://www.cmake.org/mailman/listinfo/cmake ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] include directories,
On Wed 10 Aug 2011 04:51:36 PM CEST, Łukasz Tasz wrote: Hi All, Can somebody please advise me with this topic, if it is expected behaviour or a bug? thanks in advance Lukasz 2011/8/4 Łukasz Tasz luk...@tasz.eu: Hi All, I have a question according include_directories() function and INCLUDE_DIRECTORIES directory property. Is it possible that I will know set of include directories that will be used by preprocessor when I'm calling add_executable function? I notticed, that order does not matter, for example: add_library(test test.cxx) include_directories(${CMAKE_CURRENT_SOURCE_DIR}libtest) add_library(test1 test1.cxx) both targets will have the same include directories. so from CMake phase I'm not able to check what will be includes configuration, INCLUDE_DIRECTORIES property contain only current one. is this expected behaviour or this can be tuned by setting some policy? thanks in advance Lukasz Tasz It is expected behaviour. The INCLUDE_DIRECTORIES is a directory property, and applies to *all* targets defined in that directory. The targets themselves get generated *after* the processing of the full CMakeLists.txt file in this directory. However, the get_directory() call gets evaluated immediately. I suspect what you want is different include paths for some of the files or targets, right? Currently the only solution is to put these targets into different directories. If you need file-level differentiation, you'll need static libraries in distinct directories. I know, it is a PITA and has caused much grief for a lot of people on this list... ;-) Michael ___ 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Unable to locate boost_unit_test_framework-vc90-mt-gd-1_45.lib
On 08/10/2011 04:27 PM, Stephen Torri wrote: I am having a problem setting up CMake to find the Boost unit test framework library when building a test program. In the top level CMakeLists.txt file I have: ENABLE_TESTING() add_subdirectory ( path/to/test ) In the test directory CMakeLists.txt file I have: LINK_DIRECTORIES ( ${Boost_LIBRARY_DIRS} ) ADD_EXECUTABLE ( test test.cpp ) ADD_TEST ( test ${CMAKE_CURRENT_BINARY_DIR}/test ) I added the LINK_DIRECTORIES because I though that the linker was not getting the path to the Boost library. That is wrong since the full path to the library is in the properties for this project. So I figured since it had the full name it should be able to find it. Not quite. The error message I get says: LNK1104: cannot open file 'boost_unit_test_framework-vc90-mt-gd-1_45.lib' I have boost installed in C:\boost. The FIND_BOOST macro able to find the installation headers and libraries I require. The only thing that is different is that the directory has the Boost unit test framework named as: C:\boost\lib\libboost_unit_test_framework-vc90-mt-gd-1_45.lib That name, libboost_unit_test, is different from the expected name of boost_unit_test... I am at a loss as to why this is the case. CMake version: 2.8.4 Boost version: 1.45 Stephen Could you provide a minimal but complete example that demonstrates the issue, perhaps along with the output from the build phase? Regards, Michael ___ 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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.5-1476-ga9a6364
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 a9a6364a117e437eef3902293820f961bc584cb8 (commit) via 44430379b778b71f59d36c52870e5256ab456fd6 (commit) from 559c40479c474f9c0fd21edc5b46160964fd70a7 (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=a9a6364a117e437eef3902293820f961bc584cb8 commit a9a6364a117e437eef3902293820f961bc584cb8 Merge: 559c404 4443037 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 07:44:58 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 07:44:58 2011 -0400 Merge topic 'generate_export_header' into next 4443037 Fix tests with clang. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44430379b778b71f59d36c52870e5256ab456fd6 commit 44430379b778b71f59d36c52870e5256ab456fd6 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 13:41:47 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 13:43:48 2011 +0200 Fix tests with clang. diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt index 4f40b92..fd541dc 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -44,7 +44,7 @@ macro(_do_build Include Library LibrarySource Source) add_compiler_export_flags()\n -if(CMAKE_COMPILER_IS_GNUCXX)\n +if(CMAKE_COMPILER_IS_GNUCXXOR OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))\n add_definitions(-Werror)\n else()\n if(MSVC)\n @@ -76,10 +76,11 @@ endmacro() macro(build_fail Include Library LibrarySource Source Message) _do_build(${Include} ${Library} ${LibrarySource} ${Source}) - if((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32) + if((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32 OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)) test_fail(Result ${Message}) - endif() + else() test_pass(Result ${Message}) + endif() endmacro() macro(build_pass Include Library LibrarySource Source Message) @@ -112,7 +113,7 @@ add_subdirectory(lib_shared_and_statictest) add_subdirectory(override_symbol) -if (CMAKE_COMPILER_IS_GNUCXX) +if (CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)) # We deliberately call deprecated methods, and test for that elsewhere. # No need to clutter the test output with warnings. set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations) --- Summary of changes: Tests/Module/GenerateExportHeader/CMakeLists.txt |9 + 1 files changed, 5 insertions(+), 4 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.5-1480-g61ef369
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 61ef369265fbbad328db05c9efb82591ff35dd7a (commit) via 61726f867eef69bea9237fb0b20c29b1ab3e35c1 (commit) from 7712433fb55845b723fd39fbf48eb5f282f1901f (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=61ef369265fbbad328db05c9efb82591ff35dd7a commit 61ef369265fbbad328db05c9efb82591ff35dd7a Merge: 7712433 61726f8 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 09:21:45 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 09:21:45 2011 -0400 Merge topic 'generate_export_header' into next 61726f8 Only run the failure tests with gcc = 4.2 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61726f867eef69bea9237fb0b20c29b1ab3e35c1 commit 61726f867eef69bea9237fb0b20c29b1ab3e35c1 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 15:16:28 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 15:17:01 2011 +0200 Only run the failure tests with gcc = 4.2 diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt index 140b399..6374087 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -74,9 +74,24 @@ macro(_do_build Include Library LibrarySource Source) ) endmacro() +if (CMAKE_COMPILER_IS_GNUCXX) + exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) + string (REGEX MATCH [345]\\.[0-9]\\.[0-9] _gcc_version ${_gcc_version_info}) + # gcc on mac just reports: gcc (GCC) 3.3 20030304 ... without the + # patch level, handle this here: + if(NOT _gcc_version) +string (REGEX REPLACE .*\\(GCC\\).* ([34]\\.[0-9]) .* \\1.0 _gcc_version ${_gcc_version_info}) + endif() + + if(${_gcc_version} VERSION_LESS 4.2) +set(GCC_IS_LESS_THAN_4_2 TRUE) +message(WARNING GCC version older than 4.2. Actual version: ${_gcc_version}) + endif() +endif() + macro(build_fail Include Library LibrarySource Source Message) _do_build(${Include} ${Library} ${LibrarySource} ${Source}) - if((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32 OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)) + if(NOT GCC_IS_LESS_THAN_4_2 AND (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32 OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)) test_fail(Result ${Message}) else() test_pass(Result ${Message}) --- Summary of changes: Tests/Module/GenerateExportHeader/CMakeLists.txt | 17 - 1 files changed, 16 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.5-1482-gde83ca6
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 de83ca6e51c191db2e6231f85c0cfbe18ddc0e65 (commit) via af443b830b550454cf9bdd21a49183eb6e4ba22e (commit) from 61ef369265fbbad328db05c9efb82591ff35dd7a (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=de83ca6e51c191db2e6231f85c0cfbe18ddc0e65 commit de83ca6e51c191db2e6231f85c0cfbe18ddc0e65 Merge: 61ef369 af443b8 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 15:04:40 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 15:04:40 2011 -0400 Merge topic 'generate_export_header' into next af443b8 Set the CMAKE_RUNTIME_OUTPUT_DIRECTORY for windows builds. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af443b830b550454cf9bdd21a49183eb6e4ba22e commit af443b830b550454cf9bdd21a49183eb6e4ba22e Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 21:01:42 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 21:01:42 2011 +0200 Set the CMAKE_RUNTIME_OUTPUT_DIRECTORY for windows builds. diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt index 6374087..0cc67a9 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -40,6 +40,8 @@ macro(_do_build Include Library LibrarySource Source) set(CMAKE_INCLUDE_CURRENT_DIR ON)\n +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \${CMAKE_CURRENT_BINARY_DIR})\n + include(GenerateExportHeader)\n add_compiler_export_flags()\n @@ -111,6 +113,8 @@ if (MSVC) add_definitions(-DCOMPILER_IS_MSVC) endif() +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set(link_libraries) macro(macro_add_test_library name) add_subdirectory(${name}) --- Summary of changes: Tests/Module/GenerateExportHeader/CMakeLists.txt |4 1 files changed, 4 insertions(+), 0 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.5-1485-g2de4471
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 2de4471256fc40a1d6c13b5199e3efdaa57e32ba (commit) via bab4a22036a988f49e1b711d092416c18cc16870 (commit) via cff94935982def7302cca11d521bf55587b8ebf7 (commit) from de83ca6e51c191db2e6231f85c0cfbe18ddc0e65 (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=2de4471256fc40a1d6c13b5199e3efdaa57e32ba commit 2de4471256fc40a1d6c13b5199e3efdaa57e32ba Merge: de83ca6 bab4a22 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 15:29:38 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 15:29:38 2011 -0400 Merge topic 'generate_export_header' into next bab4a22 Disable all export macros on Borland. cff9493 Only set the COMPILER_HAS_HIDDEN_VISIBILITY if GCC = 4.2 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bab4a22036a988f49e1b711d092416c18cc16870 commit bab4a22036a988f49e1b711d092416c18cc16870 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 21:28:42 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 21:28:42 2011 +0200 Disable all export macros on Borland. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index cb7b0d8..1395f15 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -148,7 +148,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) set(DEFINE_IMPORT) set(DEFINE_NO_EXPORT) - if(WIN32) + if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)) set(DEFINE_DEPRECATED __declspec(deprecated)) else() set(DEFINE_DEPRECATED __attribute__ ((__deprecated__))) @@ -157,7 +157,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE) if(NOT ${type} STREQUAL STATIC_LIBRARY) -if(WIN32) +if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)) set(DEFINE_EXPORT __declspec(dllexport)) set(DEFINE_IMPORT __declspec(dllimport)) elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cff94935982def7302cca11d521bf55587b8ebf7 commit cff94935982def7302cca11d521bf55587b8ebf7 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 21:13:33 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 21:14:46 2011 +0200 Only set the COMPILER_HAS_HIDDEN_VISIBILITY if GCC = 4.2 Hearsay has it that before that version it didn't work properly. Hopefully this will fix more dashboard builds. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 7e644b1..cb7b0d8 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -116,10 +116,28 @@ include(CMakeParseArguments) include(CheckCXXCompilerFlag) macro(_test_compiler_hidden_visibility) - check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) - check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) - option(USE_COMPILER_HIDDEN_VISIBILITY Use HIDDEN visibility support if available. ON) - mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY) + + if (CMAKE_COMPILER_IS_GNUCXX) +exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) +string (REGEX MATCH [345]\\.[0-9]\\.[0-9] _gcc_version ${_gcc_version_info}) +# gcc on mac just reports: gcc (GCC) 3.3 20030304 ... without the +# patch level, handle this here: +if(NOT _gcc_version) + string (REGEX REPLACE .*\\(GCC\\).* ([34]\\.[0-9]) .* \\1.0 _gcc_version ${_gcc_version_info}) +endif() + +if(${_gcc_version} VERSION_LESS 4.2) + set(GCC_TOO_OLD TRUE) + message(WARNING GCC version older than 4.2) +endif() + endif() + + if (NOT GCC_TOO_OLD) +check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) +check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) +option(USE_COMPILER_HIDDEN_VISIBILITY Use HIDDEN visibility support if available. ON) +mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY) + endif() endmacro() set(myDir ${CMAKE_CURRENT_LIST_DIR}) @@ -233,21 +251,6 @@ function(add_compiler_export_flags) return() endif() - if (CMAKE_COMPILER_IS_GNUCXX) -exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) -string (REGEX MATCH [345]\\.[0-9]\\.[0-9] _gcc_version ${_gcc_version_info}) -# gcc on mac just reports: gcc (GCC)
[Cmake-commits] CMake branch, next, updated. v2.8.5-1487-g3621ad6
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 3621ad6e511fb0f9190ec51621b970ffb30d3434 (commit) via fc3772edc9efc924f9d76c630719914c556e1d4e (commit) from 2de4471256fc40a1d6c13b5199e3efdaa57e32ba (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=3621ad6e511fb0f9190ec51621b970ffb30d3434 commit 3621ad6e511fb0f9190ec51621b970ffb30d3434 Merge: 2de4471 fc3772e Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 15:43:45 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 15:43:45 2011 -0400 Merge topic 'generate_export_header' into next fc3772e Another attempt to fix the tests on Borland. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc3772edc9efc924f9d76c630719914c556e1d4e commit fc3772edc9efc924f9d76c630719914c556e1d4e Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 21:43:16 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 21:43:16 2011 +0200 Another attempt to fix the tests on Borland. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 1395f15..1578365 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -148,8 +148,10 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) set(DEFINE_IMPORT) set(DEFINE_NO_EXPORT) - if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)) -set(DEFINE_DEPRECATED __declspec(deprecated)) + if(WIN32) +if (${CMAKE_CXX_COMPILER_ID} MATCHES Borland) + set(DEFINE_DEPRECATED __declspec(deprecated)) +endif() else() set(DEFINE_DEPRECATED __attribute__ ((__deprecated__))) endif() @@ -157,9 +159,11 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE) if(NOT ${type} STREQUAL STATIC_LIBRARY) -if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)) - set(DEFINE_EXPORT __declspec(dllexport)) - set(DEFINE_IMPORT __declspec(dllimport)) +if(WIN32) + if (NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)) +set(DEFINE_EXPORT __declspec(dllexport)) +set(DEFINE_IMPORT __declspec(dllimport)) + endif() elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) set(DEFINE_EXPORT __attribute__((visibility(\default\ set(DEFINE_IMPORT __attribute__((visibility(\default\ --- Summary of changes: Modules/GenerateExportHeader.cmake | 14 +- 1 files changed, 9 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.5-1491-g2820613
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 282061384a9cfea31b38f7ef83c6f96491f1c33d (commit) via 50460ea9de40d7c8ef631bbdb5d44b9aa4c14718 (commit) from faeaf44144bb727ca68e186dd4f25135a594abf2 (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=282061384a9cfea31b38f7ef83c6f96491f1c33d commit 282061384a9cfea31b38f7ef83c6f96491f1c33d Merge: faeaf44 50460ea Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 15:54:20 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 15:54:20 2011 -0400 Merge topic 'generate_export_header' into next 50460ea Fix off-by-not in test for Borland. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50460ea9de40d7c8ef631bbdb5d44b9aa4c14718 commit 50460ea9de40d7c8ef631bbdb5d44b9aa4c14718 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 21:53:58 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 21:53:58 2011 +0200 Fix off-by-not in test for Borland. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 1578365..5ecb807 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -149,7 +149,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) set(DEFINE_NO_EXPORT) if(WIN32) -if (${CMAKE_CXX_COMPILER_ID} MATCHES Borland) +if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland) set(DEFINE_DEPRECATED __declspec(deprecated)) endif() else() --- Summary of changes: Modules/GenerateExportHeader.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.5-1498-ga155876
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 a1558768fe281a9b706b84596f5ab6a209ffcdc6 (commit) via 7fa559232e6bca09c0f24c0a3da2a83a5c395be3 (commit) from d07d12a09368730f471534dfcdc4bd519c9ea814 (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=a1558768fe281a9b706b84596f5ab6a209ffcdc6 commit a1558768fe281a9b706b84596f5ab6a209ffcdc6 Merge: d07d12a 7fa5592 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 18:01:53 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 10 18:01:53 2011 -0400 Merge topic 'generate_export_header' into next 7fa5592 Add some debug output to narrow down deprecation test issues http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fa559232e6bca09c0f24c0a3da2a83a5c395be3 commit 7fa559232e6bca09c0f24c0a3da2a83a5c395be3 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Aug 10 23:57:04 2011 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Aug 10 23:57:04 2011 +0200 Add some debug output to narrow down deprecation test issues Particularly Borland and VS7.0 seem to still be failing. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index c921d89..9dd8f4a 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -149,7 +149,9 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) set(DEFINE_NO_EXPORT) if(WIN32) +message(Compiler is ${CMAKE_CXX_COMPILER_ID}) if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland) + message(Deprecation macro enabled.) set(DEFINE_DEPRECATED __declspec(deprecated)) endif() else() --- Summary of changes: Modules/GenerateExportHeader.cmake |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits