[cmake-developers] [CMake 0014763]: Add target properties to specify MS compiler PDB files
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14763 == Reported By:Brad King Assigned To:Brad King == Project:CMake Issue ID: 14763 Category: CMake Reproducibility:N/A Severity: feature Priority: normal Status: assigned Target Version: CMake 3.1 == Date Submitted: 2014-02-18 09:58 EST Last Modified: 2014-02-18 09:58 EST == Summary:Add target properties to specify MS compiler PDB files Description: As reported in issue http://www.cmake.org/Bug/view.php?id=14062 and documented in more detail in http://www.cmake.org/Bug/view.php?id=14600, compiler PDB files are different from linker PDB files. The issues were resolved by removing the influence of PDB_NAME and PDB_OUTPUT_DIRECTORY target properties on the /Fd flag of cl so that we do not specify the same file as both the compiler and linker program databases. However, for static libraries there is no linker program database so the compiler program database becomes more important. We need new target properties to control the compiler program database location: COMPILE_PDB_NAME COMPILE_PDB_OUTPUT_DIRECTORY[_CONFIG] == Issue History Date ModifiedUsername FieldChange == 2014-02-18 09:58 Brad King New Issue 2014-02-18 09:58 Brad King Status new = assigned 2014-02-18 09:58 Brad King Assigned To = Brad King == -- 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] New EVIS parser moving forward (3.1)
Since the current ExpandVariablesInString has all kinds of pitfalls and
corner cases plus how close to the core of CMake this code change is, it
seems that a policy is warranted. Since the new parser is fast enough,
in the WARN case, it will run both the new and the old parsers and warn
when the expansion is different (or causes errors) because of the new
rules.
The other parser improvements (generator expressions and list expansion)
have been split out so that they may make it into 3.0 (ideally).
Things that I plan on changing with the new EVIS parser:
- No more '(' or ')' allowed in literal variable names. Previously,
these were only allowed in quoted $ENV{} expansions (though with my
(admittedly) limited lex/yacc knowledge, I don't see why this was
allowed anyways). I don't think there's much of a loss here,
personally. There may be other allowed characters no longer allowed,
so for the sake of clarity, the only *literal* characters allowed in
variable names will be alphanumeric, '_', '-', '/', '+', and '.'. If
you really need other characters, this still works since variable
expansions are not looked at:
set(varname parens(k))
message($ENV{${varname}})
- @ expansion is no longer done in CMakeLists.txt, included files, for
modules. This is probably a little-known feature that I have no
problem with nuking from orbit (see bug #2722). To get @ expansion
with the new EVIS parser, either configure_file or string(CONFIGURE)
must be used. See the code and results from
Tests/RunCMake/Syntax/AtWithVariable*.cmake for some of the
weirdness the current @ expansion causes.
Are there any other corner cases I should consider banning as well? What
about behavior that should be allowed that currently isn't?
Brad informed me that Stephen Kelly is already working on two other
policies and CMP0050 is the latest on master, so I'll take CMP0053 for
the new EVIS parser behavior.
Thanks,
--Ben
--
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] New EVIS parser moving forward (3.1)
Ben Boeckel wrote: The other parser improvements (generator expressions and list expansion) have been split out so that they may make it into 3.0 (ideally). The improvements to the genex handling look fine, but I don't see a great need to get this into 3.0. That minimizes the amount of time that it gets tested, instead of maximizing it as happens by merging it just after 3.0. For this parsing stuff, I'd consider that more important. Brad informed me that Stephen Kelly is already working on two other policies and CMP0050 is the latest on master, so I'll take CMP0053 for the new EVIS parser behavior. Thanks, ok with me. 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] New EVIS parser moving forward (3.1)
On 2/18/2014 11:04 AM, Ben Boeckel wrote:
- No more '(' or ')' allowed in literal variable names. Previously,
these were only allowed in quoted $ENV{} expansions (though with my
(admittedly) limited lex/yacc knowledge, I don't see why this was
allowed anyways).
Environment variable names can contain '(' or ')', at least on Windows:
set a(b)=c
echo %a(b)%
c
Perhaps this obscure case can be supported with nested evaluation though.
-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] New EVIS parser moving forward (3.1)
On Tue, Feb 18, 2014 at 12:13:31 -0500, Brad King wrote:
Environment variable names can contain '(' or ')', at least on Windows:
set a(b)=c
echo %a(b)%
c
Perhaps this obscure case can be supported with nested evaluation though.
You can do it with the setenv(3) call in Linux as well, but bash doesn't
like it at all (env(1) can do it though). csh's setenv allows it too.
The fact that they were only supported when quoted (probably because of
the command-parser step) is surprising enough that I'd say we can just
use indirection to handle it.
--Ben
--
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 0014764]: FindOpenSSL.cmake PkgConfig results takes priority over OPENSSL_ROOT_DIR variable
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14764 == Reported By:Ho Cheung Assigned To: == Project:CMake Issue ID: 14764 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-02-18 13:51 EST Last Modified: 2014-02-18 13:51 EST == Summary:FindOpenSSL.cmake PkgConfig results takes priority over OPENSSL_ROOT_DIR variable Description: If PkgConfig is installed on a Unix-like OS (mine is installed via Macports), the FindOpenSSL.cmake scripts will use it instead of using the OPENSSL_ROOT_DIR variable. The solution seems to be to move the OPENSSL_ROOT_HINTS_AND_PATHS variable in front of the _OPENSSL_INCLUDEDIR/_OPENSSL_LIBDIR in the appropriate hinting locations. Patch is attached. == Issue History Date ModifiedUsername FieldChange == 2014-02-18 13:51 Ho Cheung New Issue 2014-02-18 13:51 Ho Cheung File Added: FindOpenSSLPkgConfigFix.diff == -- 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] New EVIS parser moving forward (3.1)
On 2/18/2014 1:38 PM, Nils Gladitz wrote: On 18.02.2014 19:18, Ben Boeckel wrote: It does seem that there are internal MSBuild errors[1] being thrown due to the branch :( . I'll take it off next until I sit down with VS and figure out what's wrong. Are you sure you are causing them? I think I remember those MSBuild errors randomly popping up and vanishing. They are sporadic failures due to some internal timing and lock issue to msbuild: MSB0001: Internal MSBuild Error: Request 3 expected to be in state Executing but state is actually Blocked They are not the fault of this topic. -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] Why does CMake set CMAKE_OSX_SYSROOT using the Xcode generator?
I'm trying to build LLVM via Xcode. In order to do that, I have to fix
some explicit uses of -isysroot, since it results in Xcode targets
that try to build for the simulator with two -isysroot flags pointing at
two different SDKs. Instead I'm trying to set XCODE_ATTRIBUTE_SDKROOT to
the appropriate value so that Xcode's project settings result in the
appropriate '-isysroot' flag.
But I'm being stymied by CMake, which is insisting on setting
CMAKE_OSX_SYSROOT to my current platform's SDK despite the fact that I'm
using the Xcode generator.
Looking at Darwin.cmake at HEAD, this seems to be intentional:
114 elseif(${CMAKE_GENERATOR} MATCHES Xcode
115OR CMAKE_OSX_DEPLOYMENT_TARGET
116OR CMAKE_OSX_ARCHITECTURES MATCHES [^;]
117OR NOT EXISTS /usr/include/sys/types.h)
118 # Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs
directory.
119 set(_CMAKE_OSX_SDKS_DIR )
120 if(OSX_DEVELOPER_ROOT)
121 foreach(d Platforms/MacOSX.platform/Developer/SDKs SDKs)
[. . .]
I don't see why this would be considered a good idea when using the
Xcode generator. It's just going to result in redundant '-isysroot'
flags, isn't it?
--Kyle Sluder
--
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] find_path doesn't work if environment variable has spaces
And the solution is to remove quotes from the environment variable.
http://stackoverflow.com/a/21842586/13136
Iulian
On Mon, Feb 17, 2014 at 11:47 PM, Iulian-Nicu Şerbănoiu
undergra...@gmail.com wrote:
Hello,
I'm using cmake 2.8.12 on Windows XP. I have an issue when calling
find_path command if an environment variable contains spaces.
Here is my CMakeLists.txt file:
CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
PROJECT (CodeTrainerPlugins)
MESSAGE($ENV{CODETRAINER_PATH})
FIND_PATH (CODETRAINER_FRAMEWORK_PATH
NAMES include/common/ExportApi.h
PATHS
ENV CODETRAINER_PATH
)
if (CODETRAINER_FRAMEWORK_PATH)
MESSAGE(STATUS CodeTrainer Framework found at:
${CODETRAINER_FRAMEWORK_PATH})
else()
MESSAGE(FATAL_ERROR CodeTrainer Framework not found)
endif()
ADD_SUBDIRECTORY(function)
ADD_SUBDIRECTORY(test)
The above script is ok when CODETRAINER_PATH variable doesn't contain any
spaces. But when this variable has spaces in it the script exits with the
above fatal error.
Is there a problem with cmake (at least on Windows) with spaces in
environment variable path?
For a complete example you can check the question I addressed on
stackoverflow:
http://stackoverflow.com/questions/21838695/find-path-doesnt-work-if-environment-variable-has-spaces
Thank you,
Iulian
--
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] Custom target with CPack fails
Hi all, I've already replied to an older thread mentioning the same issue, but still saw no reply. I have a problem with CPack when using in combination with a custom top level target. In my setup I have custom command which uses CPack to create a zip file. For me this zip file is a top level artefact (tight to a top level target). This top level target used to be a library, but for several reason I now want to use a custom target. However, if I simply change my CMake file from add_library(name ..) to add_custom_target(name ALL) the build fails. The output I get is: CPack: Create package using ZIP CPack: Install projects CPack: - Run preinstall target for: org.apache.incubator.celix.helloworld CPack Error: Problem running install command: /usr/bin/make preinstall Please check /Path/to/build/Celix/celix-build/examples/hello_world/_CPack_Packages/ZIP/PreinstallOutput.log for errors CPack Error: Error when generating package: org.apache.incubator.celix.helloworld make[2]: *** [org.apache.incubator.celix.helloworld] Error 1 make[1]: *** [examples/hello_world/CMakeFiles/org.apache.incubator.celix.helloworld.dir/all] Error 2 make: *** [all] Error 2 Strangely, if I make the custom target not a top level target, but instead create another (root only) custom top level target, and add the cpack target to it using a dependency, it works. While this works, this has the problem that the top level target is only visible in the root of my project, not in the respective sub directory (which I still would like to have). Is there something I am doing wrong? If not, why is there a difference between add_library in combination with a custom command running CPack and add_cuctom_library and the cpack command? -- Met vriendelijke groet, Alexander Broekhuis -- 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] install TARGETS given unknown argument EXPORT. with cmake 2.8.9
I've not received any responses on my question as to why the install function was not accepting the EXPORT argument on cmake 2.8.9, as the WIKI (http://www.cmake.org/Wiki/CMake/Tutorials/Packaging) indicates should work. Again: I've seen many hits on the Internet about this error, so it's not like I am the only one with this question. Does anybody have any suggestions on how to resolve this? -- 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] install TARGETS given unknown argument EXPORT. with cmake 2.8.9
david.hag...@gmail.com wrote: Does anybody have any suggestions on how to resolve this? Create an http://www.sscce.org/ and post it so that others can try what fails for you. Thanks, Steve. -- 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] install TARGETS given unknown argument EXPORT. with cmake 2.8.9
Hi David, What does your install(...) line look like so we can try to help you debug the issue? - Chuck On Wed, Feb 12, 2014 at 4:09 PM, david.hag...@gmail.com wrote: I am trying to set up component registration as per http://www.cmake.org/Wiki/CMake/Tutorials/Packaging but when I run Cmake I get the error install TARGETS given unknown argument EXPORT. While I've found many hits on Google with that error string, none that I have found have any resolution on what to do about it. Is the tutorial page in error? -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Check header file woos
All, I am trying to use CheckIncludeFiles for header file check. I know the file I want to check is located at /usr/include/lustre, so I supplied the following: include(CheckIncludeFiles) check_include_files(lustre/lustre_user.h HAVE_LUSTRE_USER_H) And it report can't find. Then I tried to be explicit about it set(CMAKE_REQUIRED_INCLUDES /usr/include/lustre) Still no avail. If I check any other header file in that directory, say sys/io.h, it will work as expected. I am puzzled ... anything I missed? Thanks -- Oliver -- 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] VS 2013 and 64 bit toolchain
I'm constantly getting out of memory errors with VS 2013 and the x86 linker. I stumbled across this blog post that recommends moving to the 64 bit linker. http://blogs.msdn.com/b/vcblog/archive/2013/10/30/the-visual-c-linker-best-practices-developer-iteration.aspx The article mentions adding /Bv to the command line to invoke the 64 bit linker. However, it appears that isn't exactly right. Later on in the comments, it is revealed that you have to edit all the *.vcxproj files and add: UseNativeEnvironmenttrue/UseNativeEnvironment to the x64 PropertyGroup for all 4 build types (Debug, Release, MinSizeRelease, RelWithDebInfo). So far I've come up empty handed with a way to do this in CMake. 1) Is it possible to force CMake to add this option to each VS project file? or 2) Is it possible to have CMake run an external command after generation which I could code to add that to the project files? Thanks for any help. Scott -- 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.2-7770-g320452d
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 320452ddfd1a697ce754f2cb2c72ff4fbf5df2b9 (commit) via 41ef3af69fe18634f5e000d208f54c5abd3354da (commit) from c2bcd04025aac3a1b3fbee337fccdee894d5bc87 (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=320452ddfd1a697ce754f2cb2c72ff4fbf5df2b9 commit 320452ddfd1a697ce754f2cb2c72ff4fbf5df2b9 Merge: c2bcd04 41ef3af Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Tue Feb 18 10:05:37 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 18 10:05:37 2014 -0500 Merge topic 'variable-expansion-tests' into next 41ef3af6 tests: Remove variable_expansion test reference http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41ef3af69fe18634f5e000d208f54c5abd3354da commit 41ef3af69fe18634f5e000d208f54c5abd3354da Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Tue Feb 18 10:05:20 2014 -0500 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Tue Feb 18 10:05:30 2014 -0500 tests: Remove variable_expansion test reference diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 5bdfba8..c29b736 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -115,5 +115,3 @@ add_RunCMake_test(CheckModules) add_RunCMake_test(CommandLine) add_RunCMake_test(install) - -add_RunCMake_test(variable_expansion) --- Summary of changes: Tests/RunCMake/CMakeLists.txt |2 -- 1 file changed, 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7768-gc2bcd04
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 c2bcd04025aac3a1b3fbee337fccdee894d5bc87 (commit) via ffee803ea20216e1d7d1709c6e5d6008f3f10c22 (commit) from d5bf45f8bfa3f10137b3d0819c826a4c318bc2a2 (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=c2bcd04025aac3a1b3fbee337fccdee894d5bc87 commit c2bcd04025aac3a1b3fbee337fccdee894d5bc87 Merge: d5bf45f ffee803 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Tue Feb 18 09:56:56 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 18 09:56:56 2014 -0500 Merge topic 'variable-expansion-tests' into next ffee803e tests: Move variable expansion into the Syntax test http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffee803ea20216e1d7d1709c6e5d6008f3f10c22 commit ffee803ea20216e1d7d1709c6e5d6008f3f10c22 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Tue Feb 18 09:56:30 2014 -0500 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Tue Feb 18 09:56:30 2014 -0500 tests: Move variable expansion into the Syntax test diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariable-stderr.txt similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt rename to Tests/RunCMake/Syntax/AtWithVariable-stderr.txt diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable.cmake b/Tests/RunCMake/Syntax/AtWithVariable.cmake similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariable.cmake rename to Tests/RunCMake/Syntax/AtWithVariable.cmake diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariableAtOnly-stderr.txt similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt rename to Tests/RunCMake/Syntax/AtWithVariableAtOnly-stderr.txt diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake b/Tests/RunCMake/Syntax/AtWithVariableAtOnly.cmake similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake rename to Tests/RunCMake/Syntax/AtWithVariableAtOnly.cmake diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile-stderr.txt similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt rename to Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile-stderr.txt diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake b/Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile.cmake similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake rename to Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile.cmake diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion-stderr.txt similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion-stderr.txt diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion.cmake similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion.cmake diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly-stderr.txt similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly-stderr.txt diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly.cmake similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly.cmake diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariableFile-stderr.txt similarity index 100% rename from Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt rename to Tests/RunCMake/Syntax/AtWithVariableFile-stderr.txt diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake b/Tests/RunCMake/Syntax/AtWithVariableFile.cmake similarity index 100% rename from
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7773-g7424ba5
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 7424ba51d70fd4ae25aa9521c256feef92ec4605 (commit) via 0c54b775a4aaec799fbbfc89cbec07222bb806b3 (commit) via 586d2ce8a7eaa76b1048226fb1e26fe52071ee8b (commit) from 320452ddfd1a697ce754f2cb2c72ff4fbf5df2b9 (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=7424ba51d70fd4ae25aa9521c256feef92ec4605 commit 7424ba51d70fd4ae25aa9521c256feef92ec4605 Merge: 320452d 0c54b77 Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Feb 18 10:11:30 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 18 10:11:30 2014 -0500 Merge topic 'doc-usage-requirements' into next 0c54b775 Help: Document the purpose of usage requirements clearly. 586d2ce8 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c54b775a4aaec799fbbfc89cbec07222bb806b3 commit 0c54b775a4aaec799fbbfc89cbec07222bb806b3 Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Feb 18 16:08:44 2014 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Tue Feb 18 16:08:44 2014 +0100 Help: Document the purpose of usage requirements clearly. People will be tempted to put things there for convenience, thereby causing conflicts similar to http://thread.gmane.org/gmane.comp.compilers.clang.devel/35162/focus=35169 where it is conceivable that the LLVM developers could put a flag on a target for convenience, which would cause conflicts for some downstreams. diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index 03eb163..d252473 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -112,6 +112,12 @@ Each command may be invoked with multiple uses of each keyword: INTERFACE USING_ARCHIVE_LIB ) +Note that usage requirements are not designed as a way to make downstreams +use particular :prop_tgt:`COMPILE_OPTIONS` or +:prop_tgt:`COMPILE_DEFINITIONS` etc for convenience only. The contents of +the properties must be **requirements**, not merely recommendations or +convenience. + Target Properties - --- Summary of changes: Help/manual/cmake-buildsystem.7.rst |6 ++ Source/CMakeVersion.cmake |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7775-g5bffed2
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 5bffed2ab24c822c62e9667f999d9a8d7e0da09a (commit)
via a4c73024b492b13af9cba813979934c65411dbfe (commit)
from 7424ba51d70fd4ae25aa9521c256feef92ec4605 (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=5bffed2ab24c822c62e9667f999d9a8d7e0da09a
commit 5bffed2ab24c822c62e9667f999d9a8d7e0da09a
Merge: 7424ba5 a4c7302
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Feb 18 10:24:13 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 18 10:24:13 2014 -0500
Merge topic 'variable-expansion-tests' into next
a4c73024 tests: Test parentheses in ENV variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4c73024b492b13af9cba813979934c65411dbfe
commit a4c73024b492b13af9cba813979934c65411dbfe
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Feb 18 10:23:47 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Feb 18 10:23:47 2014 -0500
tests: Test parentheses in ENV variables
diff --git a/Tests/RunCMake/Syntax/ParenInENV-result.txt
b/Tests/RunCMake/Syntax/ParenInENV-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInENV-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
new file mode 100644
index 000..7ecfe11
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
@@ -0,0 +1,20 @@
+CMake Warning \(dev\) at CMakeLists.txt:3 \(include\):
+ Syntax Warning in cmake code at
+
+.*/Tests/RunCMake/Syntax/ParenInENV.cmake:2:21
+
+ Argument not separated from preceding token by whitespace.
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Error at ParenInENV.cmake:2 \(message\):
+ Syntax error in cmake code at
+
+.*/Tests/RunCMake/Syntax/ParenInENV.cmake:2
+
+ when parsing string
+
+--\$ENV{e
+
+ syntax error, unexpected \$end, expecting } \(9\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/ParenInENV.cmake
b/Tests/RunCMake/Syntax/ParenInENV.cmake
new file mode 100644
index 000..148f726
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInENV.cmake
@@ -0,0 +1,2 @@
+set(ENV{e(x)} value)
+message(--$ENV{e(x)}--)
diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
b/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
new file mode 100644
index 000..7020c7e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
@@ -0,0 +1 @@
+--value--
diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
b/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
new file mode 100644
index 000..6333717
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
@@ -0,0 +1,2 @@
+set(ENV{e(x)} value)
+message(--$ENV{e(x)}--)
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 35bf7a7..dcabd8a 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -63,3 +63,5 @@ run_cmake(AtWithVariableAtOnly)
run_cmake(AtWithVariableEmptyExpansionAtOnly)
run_cmake(AtWithVariableFile)
run_cmake(AtWithVariableAtOnlyFile)
+run_cmake(ParenInENV)
+run_cmake(ParenInQuotedENV)
---
Summary of changes:
.../ParenInENV-result.txt} |0
Tests/RunCMake/Syntax/ParenInENV-stderr.txt| 20
Tests/RunCMake/Syntax/ParenInENV.cmake |2 ++
Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt |1 +
Tests/RunCMake/Syntax/ParenInQuotedENV.cmake |2 ++
Tests/RunCMake/Syntax/RunCMakeTest.cmake |2 ++
6 files changed, 27 insertions(+)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
Syntax/ParenInENV-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/ParenInENV-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenInENV.cmake
create mode 100644 Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenInQuotedENV.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, next, updated. v2.8.12.2-7780-g4803404
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 4803404d0ff7b27e4502a9ea1aaba722ffc901a6 (commit)
via dd777124903ed5e39ee02a66a5eec22c0ceafc2f (commit)
via c5f4fb5f7cf2dc2e1dfcd6b3f145e79e25f25845 (commit)
via 2563c48495d379ec27084511571c5c7b14f83c34 (commit)
via 52fc5d48978129d581453f2d72655cad6be3107b (commit)
from 5bffed2ab24c822c62e9667f999d9a8d7e0da09a (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=4803404d0ff7b27e4502a9ea1aaba722ffc901a6
commit 4803404d0ff7b27e4502a9ea1aaba722ffc901a6
Merge: 5bffed2 dd77712
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Feb 18 11:03:58 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 18 11:03:58 2014 -0500
Merge topic 'dev/faster-parsers' into next
dd777124 relnotes: Add release notes for the branch
c5f4fb5f cmGeneratorExpression: Improve parsing in StripEmptyListElements
2563c484 cmGeneratorExpressionLexer: Use a switch statement to parse
52fc5d48 ExpandListArguments: Optimize the parser
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd777124903ed5e39ee02a66a5eec22c0ceafc2f
commit dd777124903ed5e39ee02a66a5eec22c0ceafc2f
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Feb 11 13:54:07 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Feb 18 10:57:21 2014 -0500
relnotes: Add release notes for the branch
diff --git a/Help/release/dev/faster-parsers.rst
b/Help/release/dev/faster-parsers.rst
new file mode 100644
index 000..c2a8bfb
--- /dev/null
+++ b/Help/release/dev/faster-parsers.rst
@@ -0,0 +1,6 @@
+faster-parsers
+--
+
+* The :manual:`cmake-language(7)` internal implementation of generator
+ expression and list expansion parsers have been optimized and shows
+ non-trivial speedup on large projects.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5f4fb5f7cf2dc2e1dfcd6b3f145e79e25f25845
commit c5f4fb5f7cf2dc2e1dfcd6b3f145e79e25f25845
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Sun Feb 9 05:09:52 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Feb 18 10:25:33 2014 -0500
cmGeneratorExpression: Improve parsing in StripEmptyListElements
The char-by-char parsing causes lots of reallocations which shouldn't be
necessary. To improve this, fast-path strings without a semicolon,
reserve space in the result, and insert into the result in chunks.
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 2e66d78..cd30546 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -157,17 +157,24 @@
cmCompiledGeneratorExpression::~cmCompiledGeneratorExpression()
std::string cmGeneratorExpression::StripEmptyListElements(
const std::string input)
{
+ if (input.find(';') == input.npos)
+{
+return input;
+}
std::string result;
+ result.reserve(input.size());
const char *c = input.c_str();
+ const char *last = c;
bool skipSemiColons = true;
for ( ; *c; ++c)
{
-if(c[0] == ';')
+if(*c == ';')
{
if(skipSemiColons)
{
-continue;
+result.append(last, c - last);
+last = c + 1;
}
skipSemiColons = true;
}
@@ -175,8 +182,8 @@ std::string cmGeneratorExpression::StripEmptyListElements(
{
skipSemiColons = false;
}
-result += *c;
}
+ result.append(last);
if (!result.empty() *(result.end() - 1) == ';')
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2563c48495d379ec27084511571c5c7b14f83c34
commit 2563c48495d379ec27084511571c5c7b14f83c34
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Sat Feb 8 12:01:30 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Feb 18 10:25:33 2014 -0500
cmGeneratorExpressionLexer: Use a switch statement to parse
Optimize cmGeneratorExpressionLexer::Tokenize to use a switch statement.
The many dereferences of the input pointer were expensive. Also remove
excess pointer arithmetic.
diff --git a/Source/cmGeneratorExpressionLexer.cxx
b/Source/cmGeneratorExpressionLexer.cxx
index cd71ec0..117a24e 100644
--- a/Source/cmGeneratorExpressionLexer.cxx
+++ b/Source/cmGeneratorExpressionLexer.cxx
@@ -42,42 +42,42 @@ cmGeneratorExpressionLexer::Tokenize(const char *input)
const char *upto = c;
for ( ; *c; ++c)
- {
- if(c[0] == '$' c[1] == '')
{
-InsertText(upto, c, result);
-upto = c;
-
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7782-g295828d
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 295828d68d31b7700f15bd75fc0eb736b4c0428d (commit)
via b42e016e336c47155068aeae941cc5bf865f5c50 (commit)
from 4803404d0ff7b27e4502a9ea1aaba722ffc901a6 (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=295828d68d31b7700f15bd75fc0eb736b4c0428d
commit 295828d68d31b7700f15bd75fc0eb736b4c0428d
Merge: 4803404 b42e016
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Feb 18 13:21:39 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 18 13:21:39 2014 -0500
Merge topic 'dev/faster-parsers' into next
b42e016e Revert parser improvements
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b42e016e336c47155068aeae941cc5bf865f5c50
commit b42e016e336c47155068aeae941cc5bf865f5c50
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Feb 18 13:20:49 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Feb 18 13:20:54 2014 -0500
Revert parser improvements
Causes internal MSBuild errors.
diff --git a/Help/release/dev/faster-parsers.rst
b/Help/release/dev/faster-parsers.rst
deleted file mode 100644
index c2a8bfb..000
--- a/Help/release/dev/faster-parsers.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-faster-parsers
---
-
-* The :manual:`cmake-language(7)` internal implementation of generator
- expression and list expansion parsers have been optimized and shows
- non-trivial speedup on large projects.
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index cd30546..2e66d78 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -157,24 +157,17 @@
cmCompiledGeneratorExpression::~cmCompiledGeneratorExpression()
std::string cmGeneratorExpression::StripEmptyListElements(
const std::string input)
{
- if (input.find(';') == input.npos)
-{
-return input;
-}
std::string result;
- result.reserve(input.size());
const char *c = input.c_str();
- const char *last = c;
bool skipSemiColons = true;
for ( ; *c; ++c)
{
-if(*c == ';')
+if(c[0] == ';')
{
if(skipSemiColons)
{
-result.append(last, c - last);
-last = c + 1;
+continue;
}
skipSemiColons = true;
}
@@ -182,8 +175,8 @@ std::string cmGeneratorExpression::StripEmptyListElements(
{
skipSemiColons = false;
}
+result += *c;
}
- result.append(last);
if (!result.empty() *(result.end() - 1) == ';')
{
diff --git a/Source/cmGeneratorExpressionLexer.cxx
b/Source/cmGeneratorExpressionLexer.cxx
index 117a24e..cd71ec0 100644
--- a/Source/cmGeneratorExpressionLexer.cxx
+++ b/Source/cmGeneratorExpressionLexer.cxx
@@ -42,42 +42,42 @@ cmGeneratorExpressionLexer::Tokenize(const char *input)
const char *upto = c;
for ( ; *c; ++c)
+ {
+ if(c[0] == '$' c[1] == '')
{
-switch(*c)
- {
- case '$':
-if(c[1] == '')
- {
- InsertText(upto, c, result);
- result.push_back(cmGeneratorExpressionToken(
- cmGeneratorExpressionToken::BeginExpression, c, 2));
- upto = c + 2;
- ++c;
- SawBeginExpression = true;
- }
-break;
- case '':
-InsertText(upto, c, result);
-result.push_back(cmGeneratorExpressionToken(
-cmGeneratorExpressionToken::EndExpression, c, 1));
-upto = c + 1;
-SawGeneratorExpression = SawBeginExpression;
-break;
- case ':':
-InsertText(upto, c, result);
-result.push_back(cmGeneratorExpressionToken(
-cmGeneratorExpressionToken::ColonSeparator, c, 1));
-upto = c + 1;
-break;
- case ',':
-InsertText(upto, c, result);
-result.push_back(cmGeneratorExpressionToken(
-cmGeneratorExpressionToken::CommaSeparator, c, 1));
-upto = c + 1;
-break;
- default:
-break;
- }
+InsertText(upto, c, result);
+upto = c;
+result.push_back(cmGeneratorExpressionToken(
+ cmGeneratorExpressionToken::BeginExpression, upto, 2));
+upto = c + 2;
+++c;
+SawBeginExpression = true;
+}
+ else if(c[0] == '')
+{
+InsertText(upto, c, result);
+upto = c;
+result.push_back(cmGeneratorExpressionToken(
+cmGeneratorExpressionToken::EndExpression, upto, 1));
+upto = c + 1;
+
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1454-g0b3a792
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 0b3a792bef76b85f2350fa244b7f7e033fb9ccac (commit) from 586d2ce8a7eaa76b1048226fb1e26fe52071ee8b (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=0b3a792bef76b85f2350fa244b7f7e033fb9ccac commit 0b3a792bef76b85f2350fa244b7f7e033fb9ccac Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Feb 19 00:01:07 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Feb 19 00:01:07 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 544897f..9e60e71 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 20140218) +set(CMake_VERSION_TWEAK 20140219) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
