Re: [cmake-developers] Test fails with Xcode
Brad King wrote: Part of the value of COMPILE_OPTIONS is supposed to be that it takes a ;-list of options and escapes each one appropriately. You'll have to go back and fix up the generators or cmTarget's GetCompileOptions method to use lg-EscapeForShell when appending each flag. I did this, but it does not seem to have had any effect. Thanks, Steve. -- 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] INTERFACE_LINK_LIBRARIES property?
On 06/27/2013 03:35 AM, Stephen Kelly wrote: Brad King wrote: On 6/26/2013 12:24 PM, Stephen Kelly wrote: I think the generated targets file will need to bump its minimum required version of CMake if the policy is NEW and the compatibility export option is not used. Otherwise consuming projects running older CMake versions will silently get through the CMake step and fail at build time. Yes, something has to be done to fix that. I would add a check on the cmake version with a FATAL_ERROR, like in the Qt 5 config files. It looks like bumping the CMAKE_IMPORT_FILE_VERSION alone wouldn't have any effect because there is no other code checking it, so that would have to be added. It seems easier to me and no worse to add a FATAL_ERROR? Yes, a version check with a fatal error would work. The CMAKE_IMPORT_FILE_VERSION is for forward compatibility. I do not know if we'll ever use it but I wanted to add it at the beginning just in case. -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
Re: [cmake-developers] INTERFACE_LINK_LIBRARIES property?
On 06/27/2013 05:28 AM, Stephen Kelly wrote: Please post a snippet of cmake code showing the problems you are seeing so that I can easily understand them. Consider this code using CMake 2.8.11: cmake_minimum_required(VERSION 2.8.11) #... add_library(foo SHARED foo.c) target_link_libraries(foo LINK_PUBLIC a) set_property(TARGET foo APPEND PROPERTY LINK_INTERFACE_LIBRARIES b) If someone were to change the first line to require 2.8.12 then suddenly the link interface will drop b silently. With my suggestion then tll will also populate INTERFACE_LINK_LIBRARIES if the policy is not set (or a C++-only proxy). From that the existing comparison of old and new interface properties will work. -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
Re: [cmake-developers] INTERFACE_LINK_LIBRARIES property?
Brad King wrote: On 06/27/2013 05:28 AM, Stephen Kelly wrote: Please post a snippet of cmake code showing the problems you are seeing so that I can easily understand them. Consider this code using CMake 2.8.11: cmake_minimum_required(VERSION 2.8.11) #... add_library(foo SHARED foo.c) target_link_libraries(foo LINK_PUBLIC a) set_property(TARGET foo APPEND PROPERTY LINK_INTERFACE_LIBRARIES b) If someone were to change the first line to require 2.8.12 then suddenly the link interface will drop b silently. Thanks. That was the description I was looking for. With my suggestion then tll will also populate INTERFACE_LINK_LIBRARIES if the policy is not set (or a C++-only proxy). From that the existing comparison of old and new interface properties will work. I went with the option of setting the INTERFACE_LINK_LIBRARIES unconditionally in tll. I also added a test for the case above, and added a FATAL_ERROR in the export file if required, and pushed it all to my clone again. Thanks, Steve. -- 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] Test fails with Xcode
Brad King wrote: though it may be sporadic. One dashboard that passed after I changed it to use a SHARED library now fails again. http://open.cdash.org/buildSummary.php?buildid=2948465 Thanks, Steve. -- 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] Xcode COMPILE_OPTIONS escaping
On 06/27/2013 03:27 AM, Stephen Kelly wrote: Brad King wrote: Part of the value of COMPILE_OPTIONS is supposed to be that it takes a ;-list of options and escapes each one appropriately. You'll have to go back and fix up the generators or cmTarget's GetCompileOptions method to use lg-EscapeForShell when appending each flag. I did this, but it does not seem to have had any effect. Okay, this problem is a bit deeper than I thought. I'm working on a topic to resolve it. For now I reverted the compiler-version-genex topic to make room. I will try to get my topic ready today. Thanks, -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
Re: [cmake-developers] INTERFACE_LINK_LIBRARIES property?
On 6/27/2013 10:18 AM, Stephen Kelly wrote: I went with the option of setting the INTERFACE_LINK_LIBRARIES unconditionally in tll. That's fine with me. It keeps things simpler internally. Strictly speaking we should make it conditional on the policy not being set to OLD, but it doesn't matter much. The current topic looks pretty good and I will perform more testing soon. Thanks! -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
Re: [cmake-developers] Xcode COMPILE_OPTIONS escaping
Steve, On 6/27/2013 10:34 AM, Brad King wrote: Okay, this problem is a bit deeper than I thought. I'm working on a topic to resolve it. For now I reverted the compiler-version-genex topic to make room. I will try to get my topic ready today. I've merged a 'refactor-compile-options' to next that should take care of this. Once it is clean on the dashboard please rebase your compiler-version-genex topic on it and resolve conflicts in the CompileOptions test. Thanks, -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] Stripping import libraries under Windows ?
Hi,
there is a bug here: http://public.kitware.com/Bug/view.php?id=14123 , which
says that under Windows when using mingw .dll.a files should not be stripped
during install.
A patch is also attached, which keeps import libraries from being stripped
during install:
diff --git a/Source/cmInstallTargetGenerator.cxx
b/Source/cmInstallTargetGenerator.cxx
index ed01210..5461252 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -717,9 +717,9 @@ cmInstallTargetGenerator::AddStripRule(std::ostream os,
const std::string toDestDirPath)
{
- //dont strip static libs, because it removes the only symbol table
+ //dont strip static and import libs,because it removes the only symbol table
// they have so you can't link to them anymore
- if(this-Target-GetType() == cmTarget::STATIC_LIBRARY)
+ if(this-Target-GetType() == cmTarget::STATIC_LIBRARY || this-
ImportLibrary)
{
return;
}
This looks reasonable to me, still I'd like to get some advice whether this is
the right thing to do, also e.g. for MS compilers etc.
Thanks
Alex
--
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 0014250]: CMake build fails due to Curl bug 1192
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14250 == Reported By:John Ralls Assigned To: == Project:CMake Issue ID: 14250 Category: CMake Reproducibility:always Severity: block Priority: normal Status: new == Date Submitted: 2013-06-27 15:33 EDT Last Modified: 2013-06-27 15:33 EDT == Summary:CMake build fails due to Curl bug 1192 Description: The latest llvm headers define strlcat as a macro rather than as a function, producing the following error when building CMake: Scanning dependencies of target cmcurl [ 14%] Building C object Utilities/cmcurl/CMakeFiles/cmcurl.dir/cookie.c.o In file included from /Users/john/Development/gtk-sources/cmake-2.8.11/Utilities/cmcurl/cookie.c:93: /Users/john/Development/gtk-sources/cmake-2.8.11/Utilities/cmcurl/strequal.h:42:8: error: expected parameter declarator size_t strlcat(char *dst, const char *src, size_t siz); ^ /Applications/Xcode5-DP.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/secure/_string.h:111:44: note: expanded from macro 'strlcat' __builtin___strlcat_chk (dest, src, len, __darwin_obsz (dest)) ^ /Applications/Xcode5-DP.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/secure/_common.h:39:62: note: expanded from macro '__darwin_obsz' #define __darwin_obsz(object) __builtin_object_size (object, _USE_FORTIFY_... ^ /Applications/Xcode5-DP.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/secure/_common.h:30:32: note: expanded from macro '_USE_FORTIFY_LEVEL' #define _USE_FORTIFY_LEVEL 2 ^ Additional Information: This has already been fixed in curl: http://sourceforge.net/p/curl/bugs/1192/ == Issue History Date ModifiedUsername FieldChange == 2013-06-27 15:33 John Ralls 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
Re: [cmake-developers] Test fails with Xcode
On Wed, 26 Jun 2013 09:14:51 -0400, Brad King said: though it may be sporadic. I cannot reproduce it on my OS X 10.8 machine. In the above-linked output one can see that Xcode does not build the excludedFromAll target prior to the failure. In my local build it does. Something is tricking your Xcode into not building the target. So I opened the .xcodeproj with Xcode.app and I don't see any excludedFromAll item in the 'scheme' popup. Do you? I do see an 'ALL_BUILD' item and it builds successfully. I feel I'm missing something here :) Cheers, -- Sean McBride, B. Eng s...@rogue-research.com Rogue Researchwww.rogue-research.com Mac Software Developer Montréal, Québec, Canada -- Powered by www.kitware.com 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] Stripping import libraries under Windows ?
On 06/27/2013 03:30 PM, Alexander Neundorf wrote: - if(this-Target-GetType() == cmTarget::STATIC_LIBRARY) + if(this-Target-GetType() == cmTarget::STATIC_LIBRARY || this-ImportLibrary) This looks reasonable to me, still I'd like to get some advice whether this is the right thing to do, also e.g. for MS compilers etc. Yes, it looks right to me. -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
Re: [cmake-developers] Test fails with Xcode
On 06/27/2013 03:57 PM, Sean McBride wrote: So I opened the .xcodeproj with Xcode.app and I don't see any excludedFromAll item in the 'scheme' popup. Do you? In Xcode 4.5.2 on OS X 10.8 the test passes for me and I do see excludedFromAll in the list of targets in the GUI. Please send me your .pbxproj file (off list). Thanks, -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
Re: [cmake-developers] Xcode COMPILE_OPTIONS escaping
Brad King wrote: Steve, On 6/27/2013 10:34 AM, Brad King wrote: Okay, this problem is a bit deeper than I thought. I'm working on a topic to resolve it. For now I reverted the compiler-version-genex topic to make room. I will try to get my topic ready today. I've merged a 'refactor-compile-options' to next that should take care of this. Once it is clean on the dashboard please rebase your compiler-version-genex topic on it and resolve conflicts in the CompileOptions test. Great, thanks for that! Steve. -- 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] INTERFACE_LINK_LIBRARIES property?
Brad King wrote: On 6/27/2013 10:18 AM, Stephen Kelly wrote: I went with the option of setting the INTERFACE_LINK_LIBRARIES unconditionally in tll. That's fine with me. It keeps things simpler internally. Strictly speaking we should make it conditional on the policy not being set to OLD, but it doesn't matter much. The current topic looks pretty good and I will perform more testing soon. Sounds good! I'll test it more too. Thanks, Steve. -- 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] Creating a common (= across several projects) CMake module/include-file/library
Hei hei, On Mon, May 13, 2013 at 06:17:58PM -0400, Matthew Woehlke wrote: Another option to consider is keeping the file in an external repository and using your VCS's external-repo support to bring it into your other projects. This way the file exists in your source tree, but your VCS is tracking it against a central repository, rather than each project's repo having independent copies. (This will also probably make getting the file into your source packages easier.) We do this with git submodules and adding the path of this subdirectory to the cmake paths like you described. Works pretty well. Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** pgpS98arMlF2F.pgp Description: PGP signature -- 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] CMake 2.8.11 Released!
Hei hei, On Fri, May 17, 2013 at 11:09:11AM -0400, Robert Maynard wrote: - target_link_libraries(myexe yourlib) can now build myexe sources with requirements specified Does this mean transitive linking between separate projects is possible? Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** pgpVSWAH_Mwfr.pgp Description: PGP signature -- 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] Specifying linker dependencies based on a new configuration type for vs2010
Hi all, I've setup a new build configuration called ReleaseLowOpt for a set of projects we're developing. Currently I have all the linker / compiler options being set, my problem comes when I'm determining the set of libraries to specify on the link line and which directory to pull them from. Our current structure is a large set of Core libraries that are installed into a directory according to which build configuration it's being built under (Debug / Release / ReleaseLowOpt). For the executables linking against these Core Libraries, we have a CMake function that goes through the Core Library directories and enumerates them, adding each to the linker line. For instance, all libraries under %CoreInstallDirectory%/Debug/ will be put into the Debug linker line for the executable, same process for the Release configuration. It does this through the *debug* and *optimized* keywords, but now I need to specify them for the ReleaseLowOpt configuration. I've been researching this for a little while and it seems that there are certain Target properties I could use, like IMPORTED_LINK_INTERFACE_LIBRARIES_config , but I can't seem to get that to make any difference in my link line. As a separate topic, I'm curious to understand how Target properties play into the greater structure of CMake, so I can make my code flow a bit better. Thanks for your time, Dan Sibbernsen -- 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] CMAKE_BUILD_TYPE case sensitivity
I see that this CMake variable is not case-sensitive at it and defaults to DEBUG. I'm afraid this is incorrect; the default build type is empty. When you build with Release, the flag NDEBUG is set; when you build with Debug the DEBUG flag is set. -- 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.11.1-2774-g268f97a
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 268f97a02a305e63df46187b2210c0a764052498 (commit)
via 381e35c0d27605177c04fcbb3ca05b6170a64997 (commit)
via ecef8fbdbeb770b88bfcb8c6e0fd94a2fcb3a12c (commit)
from 5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f (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=268f97a02a305e63df46187b2210c0a764052498
commit 268f97a02a305e63df46187b2210c0a764052498
Merge: 5cd8e1f 381e35c
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 27 10:15:15 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 27 10:15:15 2013 -0400
Merge topic 'compiler-version-genex' into next
381e35c Revert Escape individual COMPILE_OPTIONS entries.
ecef8fb Revert Add generator expressions for compiler versions.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=381e35c0d27605177c04fcbb3ca05b6170a64997
commit 381e35c0d27605177c04fcbb3ca05b6170a64997
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 27 10:12:06 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 27 10:12:06 2013 -0400
Revert Escape individual COMPILE_OPTIONS entries.
This reverts commit b528f1c41b51d62c0dbdcddbdd0f3266ccb35506.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 4e2b9af..684c3c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1354,7 +1354,7 @@ void cmLocalGenerator::GetCompileOptions(std::string
flags,
for(std::vectorstd::string::const_iterator li = opts.begin();
li != opts.end(); ++li)
{
-this-AppendFlags(flags, this-EscapeForShell(li-c_str()).c_str());
+this-AppendFlags(flags, li-c_str());
}
}
diff --git a/Tests/CompileOptions/CMakeLists.txt
b/Tests/CompileOptions/CMakeLists.txt
index 8a14006..6d8a96a 100644
--- a/Tests/CompileOptions/CMakeLists.txt
+++ b/Tests/CompileOptions/CMakeLists.txt
@@ -5,7 +5,7 @@ project(CompileOptions)
add_library(testlib other.cpp)
add_executable(CompileOptions main.cpp)
-set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
$$CXX_COMPILER_ID:GNU:-DTEST_DEFINE
$$CXX_COMPILER_ID:GNU:-DNEEDS_ESCAPE=\E$CAPE\)
+set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
$$CXX_COMPILER_ID:GNU:-DTEST_DEFINE)
target_link_libraries(CompileOptions testlib)
if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
diff --git a/Tests/CompileOptions/main.cpp b/Tests/CompileOptions/main.cpp
index 5d555ca..0d39050 100644
--- a/Tests/CompileOptions/main.cpp
+++ b/Tests/CompileOptions/main.cpp
@@ -5,12 +5,7 @@
# endif
#endif
-#include cstring
-
int main(int argc, char **argv)
{
-#ifdef DO_GNU_TESTS
- return strcmp(NEEDS_ESCAPE, E$CAPE) == 0 ? 0 : 1;
-#endif
return 0;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecef8fbdbeb770b88bfcb8c6e0fd94a2fcb3a12c
commit ecef8fbdbeb770b88bfcb8c6e0fd94a2fcb3a12c
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 27 10:12:01 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 27 10:12:01 2013 -0400
Revert Add generator expressions for compiler versions.
This reverts commit 166bbb6636778167f9a94fbbc6a818bba388a236.
diff --git a/Source/cmDocumentGeneratorExpressions.h
b/Source/cmDocumentGeneratorExpressions.h
index 4caaabf..7358a36 100644
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@ -54,14 +54,6 @@
else '0'.\n \
$VERSION_EQUAL:v1,v2= '1' if v1 is the same version as v2, \
else '0'.\n \
-$C_COMPILER_VERSION = The CMake-id of the C compiler\
- used.\n \
-$C_COMPILER_VERSION:ver = '1' if the CMake-id of the C \
- compiler matches ver, otherwise '0'.\n \
-$CXX_COMPILER_VERSION = The CMake-id of the CXX compiler \
- used.\n \
-$CXX_COMPILER_VERSION:ver = '1' if the CMake-id of the CXX \
- compiler matches ver, otherwise '0'.\n \
$TARGET_FILE:tgt= main file (.exe, .so.1.2, .a)\n \
$TARGET_LINKER_FILE:tgt = file used to link (.a, .lib, .so)\n \
$TARGET_SONAME_FILE:tgt = file with soname (.so.3)\n\
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 72927db..037ef31 100644
---
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2779-g4dcab11
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 4dcab11e53b843fc01ad0d1ecc267e949292603e (commit)
via d221eac81261679d3580849218220290fcd122df (commit)
via b6385cabec5356b471dc37bd999d1803555ba386 (commit)
via 0c9cc9a0775da100c9744c388bae724acbe34034 (commit)
via 297b42b0c4f74c27cbf393cefe38b72c453944d2 (commit)
from 268f97a02a305e63df46187b2210c0a764052498 (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=4dcab11e53b843fc01ad0d1ecc267e949292603e
commit 4dcab11e53b843fc01ad0d1ecc267e949292603e
Merge: 268f97a d221eac
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 27 13:04:13 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 27 13:04:13 2013 -0400
Merge topic 'refactor-compile-options' into next
d221eac Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling
b6385ca Escape target flags taken from COMPILE_OPTIONS
0c9cc9a Embarcadero: Use response files only for includes, objects, and libs
297b42b CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d221eac81261679d3580849218220290fcd122df
commit d221eac81261679d3580849218220290fcd122df
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 27 12:04:02 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 27 12:57:32 2013 -0400
Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling
Replace the cmLocalGenerator GetCompileOptions method with an
AddCompileOptions method since all call sites of the former simply
append the result to a flags string anyway.
Add a lang argument to AddCompileOptions and move the
CMAKE_LANG_FLAGS_REGEX filter into it. Move the call sites in each
generator to a location that has both the language and configuration
available. In the Makefile generator this also moves the flags from
build.make to flags.make where they belong.
diff --git a/Source/cmExtraSublimeTextGenerator.cxx
b/Source/cmExtraSublimeTextGenerator.cxx
index 29d86a6..012013c 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -429,34 +429,7 @@
cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
lg-AppendFlags(flags, makefile-GetDefineFlags());
// Add target-specific flags.
- std::string targetFlags;
- lg-GetCompileOptions(targetFlags, target, config);
- if (!targetFlags.empty())
-{
-std::string langIncludeExpr = CMAKE_;
-langIncludeExpr += language;
-langIncludeExpr += _FLAG_REGEX;
-const char* regex = makefile-GetDefinition(langIncludeExpr.c_str());
-if(regex)
- {
- cmsys::RegularExpression r(regex);
- std::vectorstd::string args;
- cmSystemTools::
-ParseWindowsCommandLine(targetFlags.c_str(), args);
- for(std::vectorstd::string::iterator i = args.begin();
- i != args.end(); ++i)
-{
-if(r.find(i-c_str()))
- {
- lg-AppendFlags(flags, i-c_str());
- }
-}
- }
-else
- {
- lg-AppendFlags(flags, targetFlags.c_str());
- }
-}
+ lg-AddCompileOptions(flags, target, config, language);
// Add source file specific flags.
lg-AppendFlags(flags, source-GetProperty(COMPILE_FLAGS));
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index d9a2620..9cfbe42 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -681,12 +681,6 @@
cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
{
// Add flags from target and source file properties.
std::string flags;
- std::string targetFlags;
- lg-GetCompileOptions(targetFlags, cmtarget, 0); // TODO: Config?
- if(!targetFlags.empty())
-{
-lg-AppendFlags(flags, targetFlags.c_str());
-}
const char* srcfmt = sf-GetProperty(Fortran_FORMAT);
switch(this-CurrentLocalGenerator-GetFortranFormat(srcfmt))
{
@@ -1704,6 +1698,8 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
this-CurrentLocalGenerator-AddLanguageFlags(cflags, C, configName);
this-CurrentLocalGenerator-AddCMP0018Flags(cflags, target,
C, configName);
+ this-CurrentLocalGenerator-
+AddCompileOptions(cflags, target, C, configName);
}
// Add language-specific flags.
@@ -1715,6 +1711,9 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
this-CurrentLocalGenerator-AddVisibilityPresetFlags(flags, target,
