Re: [cmake-developers] [wip/patch] Expose Ninja console pool feature for custom commands/targets
On Tue, Nov 04, 2014 at 12:53:07AM -0500, Ben Boeckel wrote:
On Mon, Nov 03, 2014 at 16:22:56 -0800, Peter Collingbourne wrote:
This patch exposes the Ninja console pool feature via the add_custom_command
and add_custom_target commands. Specifically, it introduces a USE_CONSOLE
flag which can be used to communicate to the generator that the command
would prefer to use the console. It has no effect on generators other than
the Ninja generator.
The patch also causes the feature to be used with the built-in cache editor.
+1 to the feature. I think there are some bugs open on the tracker for
this we should ping when appropriate.
There's http://public.kitware.com/Bug/view.php?id=14915 which I will ping
when I get a chance.
Docs/tests to come. Any comments on the proposed approach are appreciated.
See inline below.
-doing_verbatim
+doing_nothing
A separate commit to rename this would be nice.
Will do.
+else if(copy == USE_CONSOLE)
+ {
+ doing = doing_nothing;
+ console = true;
+ }
Is there any reason this could not be implemented with a JOB_POOL target
property? This would allow custom commands to be placed into a pool with
JOB_POOLS other than the console pool.
I think that any feature which allows custom commands to be placed in arbitrary
pools should be exposed separately from this feature, the reason being that
a build system may choose to implement the features orthogonally.
Having the features be separate is also useful for supporting older versions
of Ninja (1.1 to 1.4) that support the pool feature but not console pools.
cmTarget CreateGlobalTarget(const std::string name, const char* message,
const cmCustomCommandLines* commandLines,
-std::vectorstd::string depends, const char* workingDir);
+std::vectorstd::string depends, const char* workingDir,
+bool console);
A separate commit to add this parameter would be nice so that the make
current things console'd is separate from allow the user to make
targets console'd. This parameter might not even be necessary with a
generic JOB_POOL target property.
Will do.
Thanks,
--
Peter
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015233]: is there a way to force the use of bash for command execution?
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=15233 == Reported By:Bill Torpey Assigned To: == Project:CMake Issue ID: 15233 Category: CMake Reproducibility:always Severity: feature Priority: normal Status: new == Date Submitted: 2014-11-04 10:11 EST Last Modified: 2014-11-04 10:11 EST == Summary:is there a way to force the use of bash for command execution? Description: Under Linux, cmake runs external commands (e.g., specified in add_custom_command) using sh. While sh resolves to bash, when invoked as sh bash does not support many features. In particular, we need to: - Specify LD_LIBRARY_PATH for a custom command (since it is being built as part of the build process, with a non-standard compiler) - Specify ASAN_OPTIONS (since the custom commmand is being built w/clang+asan) to force it to return a zero return code. The natural way to do this is to prefix the custom command: LD_LIBRARY_PATH=... ASAN_OPTIONS=... command While this is perfectly legal bash, sh fails with No such file or directory It's possible to wrap the command in a shell script and execute that, but it would be much cleaner to specify the command directly in the CMakeLists.txt file. FWIW, we don't care about portability -- our application is strictly Linux x86_64 -- we just use CMake as a superior alternative to autotools. == Issue History Date ModifiedUsername FieldChange == 2014-11-04 10:11 Bill TorpeyNew Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] GCC HPPA linker errors
stage/fix-gcc-hppa Add -mlong-calls for gcc on HPPA. Merged to next for testing. - Chuck -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [PATCH v2 0/2] Support for continue command
Hello, I added some tests for the continue command but ran into a problem when matching stdout output: 302: Expected stdout to match: 302: 302:expect-out a 302:expect-out aa 302:expect-out 302:expect-out a 302: 302: Actual stdout: 302: 302:actual-out Not searching for unused variables given on the command line. 302:actual-out -- a 302:actual-out -- aa 302:actual-out -- 302:actual-out -- a 302:actual-out -- Configuring done 302:actual-out -- Generating done 302:actual-out -- Build files have been written to: /Users/jasny/src/cmake/Tests/RunCMake/continue/ContinueWhile-build How do I strip off the trailing Configuring done and following lines? No other -stdout.txt file I checked contains these. About the continue() outside of a block error: I added a test but I have no idea how to enforce the desired behavior. Note: cmake does not error out on break() outside of loops, too. I guess the original author used the break() code as boilerplate for continue() therefore they show the same bug. Thanks, Gregor Gregor Jasny (2): Add continue keyword (#14013) Add tests for continue command Help/command/continue.rst | 7 +++ Source/cmBootstrapCommands1.cxx| 2 + Source/cmContinueCommand.cxx | 21 + Source/cmContinueCommand.h | 55 ++ Source/cmExecutionStatus.h | 7 +++ Source/cmForEachCommand.cxx| 4 ++ Source/cmIfCommand.cxx | 5 ++ Source/cmWhileCommand.cxx | 4 ++ Tests/RunCMake/CMakeLists.txt | 1 + Tests/RunCMake/continue/CMakeLists.txt | 3 ++ Tests/RunCMake/continue/ContinueForeach-stdout.txt | 2 + Tests/RunCMake/continue/ContinueForeach.cmake | 6 +++ .../continue/ContinueNestedForeach-stdout.txt | 4 ++ .../RunCMake/continue/ContinueNestedForeach.cmake | 11 + Tests/RunCMake/continue/ContinueWhile-stdout.txt | 4 ++ Tests/RunCMake/continue/ContinueWhile.cmake| 8 .../RunCMake/continue/NoEnclosingBlock-result.txt | 1 + .../RunCMake/continue/NoEnclosingBlock-stderr.txt | 1 + Tests/RunCMake/continue/NoEnclosingBlock.cmake | 1 + Tests/RunCMake/continue/RunCMakeTest.cmake | 6 +++ 20 files changed, 153 insertions(+) create mode 100644 Help/command/continue.rst create mode 100644 Source/cmContinueCommand.cxx create mode 100644 Source/cmContinueCommand.h create mode 100644 Tests/RunCMake/continue/CMakeLists.txt create mode 100644 Tests/RunCMake/continue/ContinueForeach-stdout.txt create mode 100644 Tests/RunCMake/continue/ContinueForeach.cmake create mode 100644 Tests/RunCMake/continue/ContinueNestedForeach-stdout.txt create mode 100644 Tests/RunCMake/continue/ContinueNestedForeach.cmake create mode 100644 Tests/RunCMake/continue/ContinueWhile-stdout.txt create mode 100644 Tests/RunCMake/continue/ContinueWhile.cmake create mode 100644 Tests/RunCMake/continue/NoEnclosingBlock-result.txt create mode 100644 Tests/RunCMake/continue/NoEnclosingBlock-stderr.txt create mode 100644 Tests/RunCMake/continue/NoEnclosingBlock.cmake create mode 100644 Tests/RunCMake/continue/RunCMakeTest.cmake -- 1.9.3 (Apple Git-50) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [PATCH v2 1/2] Add continue keyword (#14013)
Original patch by Doug Barbieri.
Signed-off-by: Gregor Jasny gja...@googlemail.com
---
Help/command/continue.rst | 7 ++
Source/cmBootstrapCommands1.cxx | 2 ++
Source/cmContinueCommand.cxx| 21
Source/cmContinueCommand.h | 55 +
Source/cmExecutionStatus.h | 7 ++
Source/cmForEachCommand.cxx | 4 +++
Source/cmIfCommand.cxx | 5
Source/cmWhileCommand.cxx | 4 +++
8 files changed, 105 insertions(+)
create mode 100644 Help/command/continue.rst
create mode 100644 Source/cmContinueCommand.cxx
create mode 100644 Source/cmContinueCommand.h
diff --git a/Help/command/continue.rst b/Help/command/continue.rst
new file mode 100644
index 000..d377542
--- /dev/null
+++ b/Help/command/continue.rst
@@ -0,0 +1,7 @@
+continue
+
+
+Continue to the top of enclosing foreach or while loop.
+
+Continue allows the cmake script to abort the rest of a block in a foreach
+or while loop, and start at the top of the next iteration. See also break().
diff --git a/Source/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx
index 9093579..d129aef 100644
--- a/Source/cmBootstrapCommands1.cxx
+++ b/Source/cmBootstrapCommands1.cxx
@@ -28,6 +28,7 @@
#include cmCMakePolicyCommand.cxx
#include cmCommandArgumentsHelper.cxx
#include cmConfigureFileCommand.cxx
+#include cmContinueCommand.cxx
#include cmCoreTryCompile.cxx
#include cmCreateTestSourceList.cxx
#include cmDefinePropertyCommand.cxx
@@ -68,6 +69,7 @@ void GetBootstrapCommands1(std::listcmCommand* commands)
commands.push_back(new cmCMakeMinimumRequired);
commands.push_back(new cmCMakePolicyCommand);
commands.push_back(new cmConfigureFileCommand);
+ commands.push_back(new cmContinueCommand);
commands.push_back(new cmCreateTestSourceList);
commands.push_back(new cmDefinePropertyCommand);
commands.push_back(new cmElseCommand);
diff --git a/Source/cmContinueCommand.cxx b/Source/cmContinueCommand.cxx
new file mode 100644
index 000..ecb894b
--- /dev/null
+++ b/Source/cmContinueCommand.cxx
@@ -0,0 +1,21 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the License);
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+*/
+#include cmContinueCommand.h
+
+// cmContinueCommand
+bool cmContinueCommand::InitialPass(std::vectorstd::string const,
+ cmExecutionStatus status)
+{
+ status.SetContinueInvoked(true);
+ return true;
+}
+
diff --git a/Source/cmContinueCommand.h b/Source/cmContinueCommand.h
new file mode 100644
index 000..2107637
--- /dev/null
+++ b/Source/cmContinueCommand.h
@@ -0,0 +1,55 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the License);
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+*/
+#ifndef cmContinueCommand_h
+#define cmContinueCommand_h
+
+#include cmCommand.h
+
+/** \class cmContinueCommand
+ * \brief Continue from an enclosing foreach or while loop
+ *
+ * cmContinueCommand returns from an enclosing foreach or while loop
+ */
+class cmContinueCommand : public cmCommand
+{
+public:
+ /**
+ * This is a virtual constructor for the command.
+ */
+ virtual cmCommand* Clone()
+{
+return new cmContinueCommand;
+}
+
+ /**
+ * This is called when the command is first encountered in
+ * the CMakeLists.txt file.
+ */
+ virtual bool InitialPass(std::vectorstd::string const args,
+ cmExecutionStatus status);
+
+ /**
+ * This determines if the command is invoked when in script mode.
+ */
+ virtual bool IsScriptable() const { return true; }
+
+ /**
+ * The name of the command as specified in CMakeList.txt.
+ */
+ virtual std::string GetName() const { return continue; }
+
+ cmTypeMacro(cmContinueCommand, cmCommand);
+};
+
+
+
+#endif
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index 5c94a97..d4da5a4 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -36,10 +36,16 @@ public:
virtual bool GetBreakInvoked()
{ return this-BreakInvoked; }
+ virtual
Re: [cmake-developers] [PATCH v2 0/2] Support for continue command
On 11/04/2014 03:10 PM, Gregor Jasny wrote: 302: Expected stdout to match: 302: 302:expect-out a 302:expect-out aa 302:expect-out 302:expect-out a The message(STATUS) output lines start with -- so you need to add that to your expected output in order to match correctly. How do I strip off the trailing Configuring done and following lines? You don't need to do that because the expectation does not have to match the entire output unless you add your own '^' at the beginning and '$' at the end. About the continue() outside of a block error: I added a test but I have no idea how to enforce the desired behavior. It's been a while since I looked at the relevant parts of the code but here is one approach that may work: Find all call sites to cmMakefile::ExecuteCommand. Teach them to check the resulting status argument for GetContinueInvoked. If it is true for any call sites other than the loop implementations then it is an error. Note: cmake does not error out on break() outside of loops, too. I guess the original author used the break() code as boilerplate for continue() therefore they show the same bug. The break() command was added a long time ago when we were much less mature and also less rigorous about testing. That bug should be fixed in break() with a policy, but that is outside the scope of your work to add the new continue() command. If you want to try it as another topic after adding continue() I can provide guidance. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] Assembly/preprocessed targets for Fortran
Hi all, I was trying to generate the assembly listing for some Fortran code and while searching for how to do it in CMake, I came across an email thread from a few years ago from somebody asking how to do it in C/C++ by running `make file.s`. I vaguely remembered knowing this at one point so I tried it with my Fortran source and those targets didn't exist. I was about to get on the mailing list to ask if anybody else came across this problem, but first I clicked through the email thread and there was a message that I sent out basically saying Hey, this doesn't work for Fortran -- is there any way that could be fixed? I guess I send too many emails and forgot about that. At any rate, I looked through the CMake source code and it didn't seem that hard to make it work correctly for Fortran also. I made the changes on my local branch and it works great for the Intel and GNU compiler suites on Linux (those are the only ones I have access to). I modified the other compiler modules on the assumption that the options were the same for C, C++ and Fortran source files (which is true for Intel and GNU). I have a couple questions: 1) There are only 2 lines that needed changing in the C++ source to enable the functionality. In both places it is adding Fortran to the check for C and C++ when assigning the `lang_is_c_or_cxx` variable. That variable name should change, but is `lang_is_c_or_cxx_or_fortran` really a good name? Seems a bit long, but it's not used often and that makes it very clear what it is storing. 2) How would/could I go about testing the changes to the other compilers/platforms that I do not have personal access to? I'd like to verify the options work, and that I didn't miss any compilers/platforms. Let me know if this is something that anybody else is interested in and I can send out a patch or something to get it tested. If there is interest in including the update, I can send a patch if that's easier than setting me up for push access -- the changes are really minor. Thanks, Tim -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] CMake (C++) coding style
Hello, could you please point me to some documentation regarding C++ coding style? Or do you have a checkpatch script? Google was not very helpful. Thanks, Gregor -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Assembly/preprocessed targets for Fortran
On 11/04/2014 03:19 PM, Tim Gallagher wrote: I looked through the CMake source code and it didn't seem that hard to make it work correctly for Fortran also. I made the changes on my local branch and it works great for the Intel and GNU compiler suites on Linux (those are the only ones I have access to). I modified the other compiler modules on the assumption that the options were the same for C, C++ and Fortran source files (which is true for Intel and GNU). Great, thanks for looking into this. adding Fortran to the check for C and C++ when assigning the `lang_is_c_or_cxx` variable. That variable name should change Perhaps lang_has_preprocessor? You could also add bool const lang_has_assembly = lang_has_preprocessor; and update each use of the variable to use the proper name. In the future the answer may not be the same. Watch out for other uses of lang_is_c_or_cxx, like for CMAKE_EXPORT_COMPILE_COMMANDS. Check if each use case makes sense for Fortran. 2) How would/could I go about testing the changes to the other compilers/platforms that I do not have personal access to? You could look at adding coverage of these make targets to the test suite under the proper conditions. That will likely be a harder change than your main fix though. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] CMake (C++) coding style
On 11/04/2014 03:37 PM, Gregor Jasny wrote:
could you please point me to some documentation regarding C++ coding
style? Or do you have a checkpatch script?
It's never been formalized to that level. Basically:
- Don't exceed 79 columns.
- Align {} with the code inside them.
- CamelCase class member names.
- Explicit this for member access: this-Member
Otherwise, try to match the style near the code you're changing.
Someday this should be added to the cmake-developer(7) manual:
http://www.cmake.org/cmake/help/v3.1/manual/cmake-developer.7.html
Right now it only has a style guide for the documentation formatting.
-Brad
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] GCC HPPA linker errors
Am Dienstag, 4. November 2014, 11:27:24 schrieb Chuck Atkins: stage/fix-gcc-hppa Add -mlong-calls for gcc on HPPA. Merged to next for testing. Sorry, saw this mail only after I mailed you privately because I looked into the commit log first. For general consumption, here are the relevant parts again: Please make sure you also add these to bootstrap. And please see the very end of CompileFlags.cmake where we already added workarounds for HPPA, those are also in bootstrap. Until now we have not seen the problem on HP-UX, so this has been restricted to Linux until now. Greetings, Eike signature.asc Description: This is a digitally signed message part. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Assembly/preprocessed targets for Fortran
Hi Brad, Thanks for the info. What does the CMAKE_EXPORT_COMPILE_COMMANDS do? Or maybe more precisely, what output should I expect when it is set to ON instead of OFF? I tried it with my changes and nothing breaks, but I also don't see any difference in outputs with it set to ON so maybe I am missing something. I'll also dig into the testing to see what it would take to add the coverage. Thanks again, Tim - Original Message - From: Brad King brad.k...@kitware.com To: tim gallagher tim.gallag...@gatech.edu, cmake-developers@cmake.org Sent: Tuesday, November 4, 2014 3:45:39 PM Subject: Re: [cmake-developers] Assembly/preprocessed targets for Fortran On 11/04/2014 03:19 PM, Tim Gallagher wrote: I looked through the CMake source code and it didn't seem that hard to make it work correctly for Fortran also. I made the changes on my local branch and it works great for the Intel and GNU compiler suites on Linux (those are the only ones I have access to). I modified the other compiler modules on the assumption that the options were the same for C, C++ and Fortran source files (which is true for Intel and GNU). Great, thanks for looking into this. adding Fortran to the check for C and C++ when assigning the `lang_is_c_or_cxx` variable. That variable name should change Perhaps lang_has_preprocessor? You could also add bool const lang_has_assembly = lang_has_preprocessor; and update each use of the variable to use the proper name. In the future the answer may not be the same. Watch out for other uses of lang_is_c_or_cxx, like for CMAKE_EXPORT_COMPILE_COMMANDS. Check if each use case makes sense for Fortran. 2) How would/could I go about testing the changes to the other compilers/platforms that I do not have personal access to? You could look at adding coverage of these make targets to the test suite under the proper conditions. That will likely be a harder change than your main fix though. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Assembly/preprocessed targets for Fortran
Scratch that, I found it. Wasn't looking in the right places! The export command works for Fortran, so that's not an issue. I'll take a look at the testing and see if I can get that going. I'll send along a patch when I get it worked out. Thanks, Tim - Original Message - From: Tim Gallagher tim.gallag...@gatech.edu To: Brad King brad.k...@kitware.com Cc: cmake-developers@cmake.org Sent: Tuesday, November 4, 2014 4:08:49 PM Subject: Re: [cmake-developers] Assembly/preprocessed targets for Fortran Hi Brad, Thanks for the info. What does the CMAKE_EXPORT_COMPILE_COMMANDS do? Or maybe more precisely, what output should I expect when it is set to ON instead of OFF? I tried it with my changes and nothing breaks, but I also don't see any difference in outputs with it set to ON so maybe I am missing something. I'll also dig into the testing to see what it would take to add the coverage. Thanks again, Tim - Original Message - From: Brad King brad.k...@kitware.com To: tim gallagher tim.gallag...@gatech.edu, cmake-developers@cmake.org Sent: Tuesday, November 4, 2014 3:45:39 PM Subject: Re: [cmake-developers] Assembly/preprocessed targets for Fortran On 11/04/2014 03:19 PM, Tim Gallagher wrote: I looked through the CMake source code and it didn't seem that hard to make it work correctly for Fortran also. I made the changes on my local branch and it works great for the Intel and GNU compiler suites on Linux (those are the only ones I have access to). I modified the other compiler modules on the assumption that the options were the same for C, C++ and Fortran source files (which is true for Intel and GNU). Great, thanks for looking into this. adding Fortran to the check for C and C++ when assigning the `lang_is_c_or_cxx` variable. That variable name should change Perhaps lang_has_preprocessor? You could also add bool const lang_has_assembly = lang_has_preprocessor; and update each use of the variable to use the proper name. In the future the answer may not be the same. Watch out for other uses of lang_is_c_or_cxx, like for CMAKE_EXPORT_COMPILE_COMMANDS. Check if each use case makes sense for Fortran. 2) How would/could I go about testing the changes to the other compilers/platforms that I do not have personal access to? You could look at adding coverage of these make targets to the test suite under the proper conditions. That will likely be a harder change than your main fix though. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] GCC HPPA linker errors
Please make sure you also add these to bootstrap.sh. Will do. And please see the very end of CompileFlags.cmake where we already added workarounds for HPPA. Until now we have not seen the problem on HP-UX, so this has been restricted to Linux until now. I considered putting it in there but from what I can tell, the issue is specific to GCC code generation for PA-RISC, regardless of OS, and is unrelated to Linux. Would you be able to verify whether or not this is needed on PA-RISC HP-UX with GCC v4+? I only have access to an ia64 HP-UX environment. - Chuck - Chuck On Tue, Nov 4, 2014 at 3:50 PM, Rolf Eike Beer e...@sf-mail.de wrote: Am Dienstag, 4. November 2014, 11:27:24 schrieb Chuck Atkins: stage/fix-gcc-hppa Add -mlong-calls for gcc on HPPA. Merged to next for testing. Sorry, saw this mail only after I mailed you privately because I looked into the commit log first. For general consumption, here are the relevant parts again: Please make sure you also add these to bootstrap. And please see the very end of CompileFlags.cmake where we already added workarounds for HPPA, those are also in bootstrap. Until now we have not seen the problem on HP-UX, so this has been restricted to Linux until now. Greetings, Eike -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] GCC HPPA linker errors
Am Dienstag, 4. November 2014, 16:17:08 schrieb Chuck Atkins: Please make sure you also add these to bootstrap.sh. Will do. And please see the very end of CompileFlags.cmake where we already added workarounds for HPPA. Until now we have not seen the problem on HP-UX, so this has been restricted to Linux until now. I considered putting it in there but from what I can tell, the issue is specific to GCC code generation for PA-RISC, regardless of OS, and is unrelated to Linux. Would you be able to verify whether or not this is needed on PA-RISC HP-UX with GCC v4+? I only have access to an ia64 HP-UX environment. We once had one HPPA-HP-UX system that reported to the dashboard, but using aCC. The machine died and I have not heard of a replacement yet. I guess it is just a matter of taste if this will be narrowed to Linux or not. In any case please try if you can just drop the existing workarounds. The best would probably to just replace their set() with yours and see if it works. If it does you can remove the if(Linux) and only match for the processor. Greetings, Eike signature.asc Description: This is a digitally signed message part. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] GCC HPPA linker errors
just a matter of taste if this will be narrowed to Linux or not. In any case please try if you can just drop the existing workarounds. The best would probably to just replace their set() with yours and see if it works. If it does you can remove the if(Linux) and only match for the processor. I didn't realize the -Wl,--unique=.text._* was trying to address the same problem! I'll try this as a replacement tonight and we'll see if it cleans it up. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [CMake] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing!
On 10/31/14, Gilles Khouzam gilles.khou...@microsoft.com wrote: We actually have a couple if extra changes that are not fully ready to be pushed upstream yet. ~Gilles Sent from my Windows Phone Since I have your attention, using CMakeMS, I hit what looks like a bug in the generation for the Windows Phone simulator. I have not tested 3.1.0-rc1, but since it is the from the same code base, I'm assuming it is affected too. I get a linking failure for only the WinPhone simulator (Win32) binary. This is the error the linker is spitting out: vccorlib.lib(compiler.obj) : error LNK2038: mismatch detected for 'vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker': value '1' doesn't match '0' in MSVCRT.lib(appinit.obj) vccorlib.lib(compiler.obj) : error LNK2005: ___crtWinrtInitType already defined in MSVCRT.lib(appinit.obj) D:\snip\Release\FlappyBlurrr.exe : fatal error LNK1169: one or more multiply defined symbols found This only happens for me with the Win32 simulator binary. I do not have this problem with the ARM device binary, nor do I have this problem with the Windows Store x64 binary. (I do not bother with Win32 Windows Store.) Somebody helped me and told me to add these switches directly to my Visual Studio project: - for Debug builds, add: /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - for Release builds, add: /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib This seemed to make my linking problems go away. I'm thinking that CMake should automatically be setting these for me for the Windows Phone simulator. Thanks, Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Assembly/preprocessed targets for Fortran
Hi Brad, I have attached the patch to enable the targets for Fortran. It includes updates to 2 tests to make sure that it works as expected. Both of the tests pass for me with Intel and GNU but that's all I have access to. Let me know if I messed anything up or if you have any suggestions on things I should have done better/differently so I know to do it correctly next time I have a patch. Thanks, Tim - Original Message - From: Tim Gallagher tim.gallag...@gatech.edu To: tim gallagher tim.gallag...@gatech.edu Cc: cmake-developers@cmake.org, Brad King brad.k...@kitware.com Sent: Tuesday, November 4, 2014 4:12:01 PM Subject: Re: [cmake-developers] Assembly/preprocessed targets for Fortran Scratch that, I found it. Wasn't looking in the right places! The export command works for Fortran, so that's not an issue. I'll take a look at the testing and see if I can get that going. I'll send along a patch when I get it worked out. Thanks, Tim - Original Message - From: Tim Gallagher tim.gallag...@gatech.edu To: Brad King brad.k...@kitware.com Cc: cmake-developers@cmake.org Sent: Tuesday, November 4, 2014 4:08:49 PM Subject: Re: [cmake-developers] Assembly/preprocessed targets for Fortran Hi Brad, Thanks for the info. What does the CMAKE_EXPORT_COMPILE_COMMANDS do? Or maybe more precisely, what output should I expect when it is set to ON instead of OFF? I tried it with my changes and nothing breaks, but I also don't see any difference in outputs with it set to ON so maybe I am missing something. I'll also dig into the testing to see what it would take to add the coverage. Thanks again, Tim - Original Message - From: Brad King brad.k...@kitware.com To: tim gallagher tim.gallag...@gatech.edu, cmake-developers@cmake.org Sent: Tuesday, November 4, 2014 3:45:39 PM Subject: Re: [cmake-developers] Assembly/preprocessed targets for Fortran On 11/04/2014 03:19 PM, Tim Gallagher wrote: I looked through the CMake source code and it didn't seem that hard to make it work correctly for Fortran also. I made the changes on my local branch and it works great for the Intel and GNU compiler suites on Linux (those are the only ones I have access to). I modified the other compiler modules on the assumption that the options were the same for C, C++ and Fortran source files (which is true for Intel and GNU). Great, thanks for looking into this. adding Fortran to the check for C and C++ when assigning the `lang_is_c_or_cxx` variable. That variable name should change Perhaps lang_has_preprocessor? You could also add bool const lang_has_assembly = lang_has_preprocessor; and update each use of the variable to use the proper name. In the future the answer may not be the same. Watch out for other uses of lang_is_c_or_cxx, like for CMAKE_EXPORT_COMPILE_COMMANDS. Check if each use case makes sense for Fortran. 2) How would/could I go about testing the changes to the other compilers/platforms that I do not have personal access to? You could look at adding coverage of these make targets to the test suite under the proper conditions. That will likely be a harder change than your main fix though. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers From 03f06808a086dd767e3414a5a1e5fc14ecc0a0e3 Mon Sep 17 00:00:00 2001 From: Tim Gallagher tim.gallag...@gatech.edu Date: Tue, 4 Nov 2014 18:26:22 -0500 Subject: [PATCH] Enabled the generation of assembly and preprocessor targets for Fortran. The Makefile generator has been updated to create .i and .s targets for Fortran files. The variable lang_is_c_or_cxx has been changed and split into variables to indicate languages which can be preprocessed, generate assembly, or have their compile commands output. This should allow for more fine-grained control over these behaviors if languages can handle some or all of those features. The modules have been updated to set the CMAKE_Fortran_CREATE_* flags required. This has been tested successfully on Intel and GNU suites but remains untested for the others. The assumption is that other Fortran compilers handle the options the same way their respective C/C++ compilers handle it. Testing has been added to the FortranOnly test to verify the preprocessor works. This test behaves the same as the test in the Complex test for C++. There is no test for assembly in C/C++ however, so there is not one in Fortran
Re: [cmake-developers] [CMake] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing!
On 11/4/14, Gilles Khouzam gilles.khou...@microsoft.com wrote: Hi Eric, Can you send me a little more details or an example that exhibits the problem? I'd be happy to take a look. Sure. I'll respond offlist for this. Thanks, Eric -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [CMake] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing!
Hi Eric, Can you send me a little more details or an example that exhibits the problem? I'd be happy to take a look. -Original Message- From: Eric Wing [mailto:ewmail...@gmail.com] Sent: Tuesday, November 4, 2014 15:21 To: Gilles Khouzam Cc: Brad King; Robert Maynard; CMake Developers; CMake MailingList Subject: Re: [CMake] [cmake-developers] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing! On 10/31/14, Gilles Khouzam gilles.khou...@microsoft.com wrote: We actually have a couple if extra changes that are not fully ready to be pushed upstream yet. ~Gilles Sent from my Windows Phone Since I have your attention, using CMakeMS, I hit what looks like a bug in the generation for the Windows Phone simulator. I have not tested 3.1.0-rc1, but since it is the from the same code base, I'm assuming it is affected too. I get a linking failure for only the WinPhone simulator (Win32) binary. This is the error the linker is spitting out: vccorlib.lib(compiler.obj) : error LNK2038: mismatch detected for 'vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker': value '1' doesn't match '0' in MSVCRT.lib(appinit.obj) vccorlib.lib(compiler.obj) : error LNK2005: ___crtWinrtInitType already defined in MSVCRT.lib(appinit.obj) D:\snip\Release\FlappyBlurrr.exe : fatal error LNK1169: one or more multiply defined symbols found This only happens for me with the Win32 simulator binary. I do not have this problem with the ARM device binary, nor do I have this problem with the Windows Store x64 binary. (I do not bother with Win32 Windows Store.) Somebody helped me and told me to add these switches directly to my Visual Studio project: - for Debug builds, add: /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - for Release builds, add: /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib This seemed to make my linking problems go away. I'm thinking that CMake should automatically be setting these for me for the Windows Phone simulator. Thanks, Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[CMake] Cmake 3.1 generated projects for VS2010+ifort12.1, compiler can't recognize $(Configuration)
Hi all I am using Cmake3.1, and want to generate a Fortran project on Visual Studio 2010. And I have ifort 12.1 installed on my computer. After generated the project, when I build them, I got error: Error 1 fatal error LNK1181: cannot open input file 'C:\MODELS\build\fabm\0d\models\bb\bb.dir\\filter_feeder.obj' LINK The Filter_feeder.obj file is under path 'C:\MODELS\build\fabm\0d\models\bb\bb.dir\Release\filter_feeder.obj' While in Fortran project file, it tells Visual studio to look for 'C:\MODELS\build\fabm\0d\models\bb\bb.dir\($Configuration)\filter_feeder.obj And apparently, my platform(VS2010 + ifort 12.1) can't recognize ($Configuration) during compilation. It is said it's due to the Visual Studio has changed environment variable ($ConfigurationName) to ($Configuration) from VS2008 to VS2010. Then I replaced all ($Configuration) by ($ConfigurationName) in the vfproj file, the compilation worked. And by the way, we have several people work on the same project, and two of my colleague using VS2010 and ifort worked perfectly with this CMake generating system. Their settings on my colleague's are: VS2010, version 10.0.40219.1 SP1Rel Intel Visual Fortran Composer XE 2013 Update 1, version 13.0.1.119 And VS2010, version 10.0.40219.1 SP1Rel Intel Visual Fortran Composer XE 2013 Update 1, version 13.0.1.119 And mine is : VS2010, version 10.0.40219.1 SP1Rel Intel Visual Fortran Composer XE 2013 Update 1, version 12.1.3534 So the only difference was the versions of ifort compiler. My version is a little old. So can CMake take this into consideration when generating project files for Fortran? Best regards Fen == Fenjuan Hu Joint Ph.D student of Southern Denmark University and Aarhus University Adr.: Department of Bioscience, Aarhus University,Vejlsøvej 25, 8600 Silkeborg, Denmark Contact info: fenj...@bios.au.dkmailto:fenj...@bios.au.dk Contact info: fenj...@biology.sdu.dkmailto:fenj...@biology.sdu.dk Mobile: +45 52640478 -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] FIND_PATH() search custom path first
Hi George, Jakub,
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_SYSTEM_PATH
The options specified are redundant. NO_DEFAULT_PATH implies the later 4.
If you just specify NO_DEFAULT_PATH then only HINTS and user guess paths
(those specified by the PATH argument) will be checked.
NO_CMAKE_FIND_ROOT_PATH
This is specific to cross compiling, and usually isn't needed unless that's
your situation.
A particularly effective and commonly used pattern is to build up the
options to the find call in a variable. The FindBoost module does this
very thing to restrict it's component search to all the same directory.
The idea is that if you have a specific location that you know your file
should be found in when set, then something like this could work:
set(FOO_FIND_OPTS)
if(FOO_DIR)
set(FOO_FIND_OPTS HINTS ${FOO_DIR} NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH)
endif()
find_library(FOO_LIBRARY MyFooLib ${FOO_FIND_OPTS})
This way, if FOO_DIR is set, then it will only look there. However, if
it's not, then FOO_FIND_OPTS is empty and the standard search will happen.
- Chuck
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] [cmake-developers] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing!
On 10/31/14, Gilles Khouzam gilles.khou...@microsoft.com wrote: We actually have a couple if extra changes that are not fully ready to be pushed upstream yet. ~Gilles Sent from my Windows Phone Since I have your attention, using CMakeMS, I hit what looks like a bug in the generation for the Windows Phone simulator. I have not tested 3.1.0-rc1, but since it is the from the same code base, I'm assuming it is affected too. I get a linking failure for only the WinPhone simulator (Win32) binary. This is the error the linker is spitting out: vccorlib.lib(compiler.obj) : error LNK2038: mismatch detected for 'vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker': value '1' doesn't match '0' in MSVCRT.lib(appinit.obj) vccorlib.lib(compiler.obj) : error LNK2005: ___crtWinrtInitType already defined in MSVCRT.lib(appinit.obj) D:\snip\Release\FlappyBlurrr.exe : fatal error LNK1169: one or more multiply defined symbols found This only happens for me with the Win32 simulator binary. I do not have this problem with the ARM device binary, nor do I have this problem with the Windows Store x64 binary. (I do not bother with Win32 Windows Store.) Somebody helped me and told me to add these switches directly to my Visual Studio project: - for Debug builds, add: /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - for Release builds, add: /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib This seemed to make my linking problems go away. I'm thinking that CMake should automatically be setting these for me for the Windows Phone simulator. Thanks, Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] [cmake-developers] Forwarding parameters to cmake through cmake-gui
Bump. With CMake 3.1 on the horizon, I was wondering if there was any progress on this. This would be really useful to me. I am basically invoking command line cmake.exe so I can pass all the right options, including my own CMake Initial Cache file. I ship an entire self-contained SDK of sorts which has all the prebuilt library dependencies in a place relative to a .bat or .sh script used to invoke cmake.exe, which makes project generation for all of my platforms essentially a turn-key operation. However, my projects have a couple of configurable options (e.g. I don't need to link in OpenAL), And it would be nice if I could present the CMake gui first so they can uncheck the options before generation. (I copy some things into the build directory on generation which means they get stuff they may not want if they can't uncheck the option first.) I think basically the behavior I want is essentially the same as ccmake, except have a proper GUI (a lot of Windows and newer users don't grok the curses thing). Thanks, Eric -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] [cmake-developers] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing!
On 11/4/14, Gilles Khouzam gilles.khou...@microsoft.com wrote: Hi Eric, Can you send me a little more details or an example that exhibits the problem? I'd be happy to take a look. Sure. I'll respond offlist for this. Thanks, Eric -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] [cmake-developers] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing!
Hi Eric, Can you send me a little more details or an example that exhibits the problem? I'd be happy to take a look. -Original Message- From: Eric Wing [mailto:ewmail...@gmail.com] Sent: Tuesday, November 4, 2014 15:21 To: Gilles Khouzam Cc: Brad King; Robert Maynard; CMake Developers; CMake MailingList Subject: Re: [CMake] [cmake-developers] [ANNOUNCE] CMake 3.1.0-rc1 now ready for testing! On 10/31/14, Gilles Khouzam gilles.khou...@microsoft.com wrote: We actually have a couple if extra changes that are not fully ready to be pushed upstream yet. ~Gilles Sent from my Windows Phone Since I have your attention, using CMakeMS, I hit what looks like a bug in the generation for the Windows Phone simulator. I have not tested 3.1.0-rc1, but since it is the from the same code base, I'm assuming it is affected too. I get a linking failure for only the WinPhone simulator (Win32) binary. This is the error the linker is spitting out: vccorlib.lib(compiler.obj) : error LNK2038: mismatch detected for 'vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker': value '1' doesn't match '0' in MSVCRT.lib(appinit.obj) vccorlib.lib(compiler.obj) : error LNK2005: ___crtWinrtInitType already defined in MSVCRT.lib(appinit.obj) D:\snip\Release\FlappyBlurrr.exe : fatal error LNK1169: one or more multiply defined symbols found This only happens for me with the Win32 simulator binary. I do not have this problem with the ARM device binary, nor do I have this problem with the Windows Store x64 binary. (I do not bother with Win32 Windows Store.) Somebody helped me and told me to add these switches directly to my Visual Studio project: - for Debug builds, add: /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - for Release builds, add: /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib This seemed to make my linking problems go away. I'm thinking that CMake should automatically be setting these for me for the Windows Phone simulator. Thanks, Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] Support OpenBLAS in FindBLAS module
Hi Folks, I am the developer of OpenBLAS, an optimized BLAS implementation forked from GotoBLAS2. So far, the FindBLAS.cmake module cannot recognize OpenBLAS as a legitimate library. Is it possible to support OpenBLAS in FindBLAS module? Best Regards, Xianyi -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] Using CMake to build an Emscripten output?
Not that I really have time to fix this, but I was experimenting with my C based codebase to see if I could compile it with Emscripten so it could run in a browser. After working around a lot of scary compiler bugs, I got it to work. But I invoked the build process by hand. So the next thing on my mind is how to leverage CMake (since all my other platforms use it already). My incantation for my test project is pretty straight foward and looks very much like a clang invocation. The major difference is that all my assets needed to be part of the compile process using the --preload-file flag. (A minor difference is the output file ends in .html) ~/Source/GIT/emscripten/emcc -O2 --js-opts 0 -g4 CircularQueue.c TimeTicker.c main_c.c -I/opt/local/emscripten/include -I/opt/local/emscripten/include/SDL2 -I /opt/local/emscripten/include/chipmunk /opt/local/emscripten/lib/libSDL2_ttf.a /opt/local/emscripten/lib/libfreetype.a /opt/local/emscripten/lib/libSDL2_image.a /opt/local/emscripten/lib/libpng.a /opt/local/emscripten/lib/libz.a /opt/local/emscripten/lib/libALmixer.a /opt/local/emscripten/lib/libchipmunk.a /opt/local/emscripten/lib/libSDL2.a -o FlappyBlurrr.html --preload-file fly2.png --preload-file fly1.png --preload-file fly0.png --preload-file VeraMono.ttf --preload-file gamecontrollerdb.txt --preload-file coin_ding.wav --preload-file background.png --preload-file bush.png --preload-file clouds.png --preload-file ground.png --preload-file pipe_bottom.png --preload-file pipe_top.png --preload-file davedes_fastsimplechop5b.wav --preload-file LeftHook_SoundBible_com-516660386.wav --preload-file SlideWhistle.wav --preload-file 14609__man__swosh.wav --preload-file acknowtt.ttf --preload-file MedalBackground.png --preload-file momoko_Bronze_Medallion.png --preload-file momoko_Silver_Medallion.png --preload-file momoko_Gold_Medallion.png --preload-file momoko_Platinum_Medallion.png --preload-file Placeholder_Medallion.png --preload-file playbutton.png --preload-file quitbutton.png --preload-file 04B_19__.TTF -s ASSERTIONS=1 Anybody used CMake with Emscripten for this purpose? Or any thoughts on what I should do? (I also have some concerns the preload-file list is going to get too long. Perhaps I'm missing something with Emscripten.) Thanks, Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Support OpenBLAS in FindBLAS module
Am Mittwoch, 5. November 2014, 09:20:15 schrieb Zhang Xianyi: Hi Folks, I am the developer of OpenBLAS, an optimized BLAS implementation forked from GotoBLAS2. So far, the FindBLAS.cmake module cannot recognize OpenBLAS as a legitimate library. Is it possible to support OpenBLAS in FindBLAS module? Yes, but the preferable solution would be that you ship a OpenBLASConfig.cmake with your installation, so it would work with any CMake version and you can adapt that file yourself in case of new components, library locations or other things. Eike signature.asc Description: This is a digitally signed message part. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] What is recommended to export / import target libraries with dependencies that are also exported
Hello,
Consider the following case where:
- I want to export/import my library named mylib
- This library depends on OpenCV that is also exported
According to
http://www.cmake.org/cmake/help/v3.0/manual/cmake-packages.7.html#creating-packages
the CMakeLists.txt of my library is simpilar to:
project(mylib)
find_package(OpenCV)
add_library(mylib foo.c foo.h)
target_link_libraries(mylib ${OpenCV_LIBS})
...
export(EXPORT mylibTargets FILE
${CMAKE_CURRENT_BINARY_DIR}/mylibTargets.cmake)
...
Now the CMakeLists of an other project that uses mylib will be like :
project(test)
find_package(mylib)
add_executable(test test.c)
target_link_libraries(test mylib)
During the build of this project the linker complains that OpenCV
libraries are not found
Linking C executable test
/Applications/CMake 3.0.0.app/Contents/bin/cmake -E cmake_link_script
CMakeFiles/test.dir/link.txt --verbose=1
/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names
CMakeFiles/test.dir/test.c.o -o test -lopencv_videostab -lopencv_video ...
ld: library not found for -lopencv_videostab
The problem comes from mylibTargets.cmake where I have:
set_target_properties(mylib PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG
opencv_videostab;opencv_video;...
IMPORTED_LOCATION_NOCONFIG /tmp/build/libmylib.dylib
IMPORTED_SONAME_NOCONFIG /tmp/build/libmylib.3.dylib
)
while I wanted to have the full path to OpenCV libraries (ie
/tmp/OpenCV/lib/libopencv_videostab.2.4.10.dylib ...
Is there a proper way to include OpenCV dependencies during the export
of my library ?
Fabien
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-291-g3f54cf9
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 3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd (commit)
via 13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b (commit)
via 38be87caa4c1470151d012e46c70f09bcbe7d334 (commit)
from bd34ac897765254bdab60c8c0a28d968f78b46d3 (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=3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd
commit 3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd
Merge: bd34ac8 13aa4e2
Author: Chuck Atkins chuck.atk...@kitware.com
AuthorDate: Tue Nov 4 11:13:23 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 4 11:13:23 2014 -0500
Merge topic 'fix-gcc-hppa' into next
13aa4e24 Workaround for short jump tables on PA-RISC.
38be87ca CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b
commit 13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b
Author: Chuck Atkins chuck.atk...@kitware.com
AuthorDate: Tue Nov 4 11:01:56 2014 -0500
Commit: Chuck Atkins chuck.atk...@kitware.com
CommitDate: Tue Nov 4 11:11:57 2014 -0500
Workaround for short jump tables on PA-RISC.
The PA-RISC architecture requires special options GCC to prevent linker
errors when libraries reach a certain size and / or complexity. See
http://mraw.org/blog/2007/10/10/Linking_on_hppa and gcc documentation
on -mlong-calls.
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 5d86876..2909cb5 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -65,6 +65,16 @@ if(CMAKE_SYSTEM_NAME MATCHES HP-UX AND
CMAKE_CXX_COMPILER_ID MATCHES HP)
endif()
endif()
+# Workaround for short jump tables on PA-RISC
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
+ if(CMAKE_COMPILER_IS_GNUC)
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mlong-calls)
+ endif()
+ if(CMAKE_COMPILER_IS_GNUCXX)
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -mlong-calls)
+ endif()
+endif()
+
# use the ansi CXX compile flag for building cmake
if (CMAKE_ANSI_CXXFLAGS)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS})
---
Summary of changes:
CompileFlags.cmake| 10 ++
Source/CMakeVersion.cmake |2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-293-gf626df6
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 f626df6b7ddecb0a981aa083bd3b499e439babd6 (commit)
via 0ead59cc37465ae19341fa49691c29d50531bc3f (commit)
from 3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd (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=f626df6b7ddecb0a981aa083bd3b499e439babd6
commit f626df6b7ddecb0a981aa083bd3b499e439babd6
Merge: 3f54cf9 0ead59c
Author: Chuck Atkins chuck.atk...@kitware.com
AuthorDate: Tue Nov 4 11:25:01 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 4 11:25:01 2014 -0500
Merge topic 'fix-gcc-hppa' into next
0ead59cc Workaround for short jump tables on PA-RISC.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ead59cc37465ae19341fa49691c29d50531bc3f
commit 0ead59cc37465ae19341fa49691c29d50531bc3f
Author: Chuck Atkins chuck.atk...@kitware.com
AuthorDate: Tue Nov 4 11:01:56 2014 -0500
Commit: Chuck Atkins chuck.atk...@kitware.com
CommitDate: Tue Nov 4 11:23:50 2014 -0500
Workaround for short jump tables on PA-RISC.
The PA-RISC architecture requires special options for GCC to prevent
linker errors when libraries reach a certain size and / or complexity.
See http://mraw.org/blog/2007/10/10/Linking_on_hppa and gcc
documentation on -mlong-calls.
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 5d86876..2909cb5 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -65,6 +65,16 @@ if(CMAKE_SYSTEM_NAME MATCHES HP-UX AND
CMAKE_CXX_COMPILER_ID MATCHES HP)
endif()
endif()
+# Workaround for short jump tables on PA-RISC
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
+ if(CMAKE_COMPILER_IS_GNUC)
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mlong-calls)
+ endif()
+ if(CMAKE_COMPILER_IS_GNUCXX)
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -mlong-calls)
+ endif()
+endif()
+
# use the ansi CXX compile flag for building cmake
if (CMAKE_ANSI_CXXFLAGS)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS})
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-295-gd547aa1
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 d547aa15c3103804818c7f53e6c1695c2b1180f6 (commit) via 468fb734b4462c2c338abff8140f90a3c9d213a5 (commit) from f626df6b7ddecb0a981aa083bd3b499e439babd6 (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=d547aa15c3103804818c7f53e6c1695c2b1180f6 commit d547aa15c3103804818c7f53e6c1695c2b1180f6 Merge: f626df6 468fb73 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 12:59:56 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 12:59:56 2014 -0500 Merge topic 'ExternalProject_independent-step-targets' into next 468fb734 Help: Add notes for topic 'ExternalProject_independent-step-targets' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=468fb734b4462c2c338abff8140f90a3c9d213a5 commit 468fb734b4462c2c338abff8140f90a3c9d213a5 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 12:56:14 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 12:56:14 2014 -0500 Help: Add notes for topic 'ExternalProject_independent-step-targets' diff --git a/Help/release/dev/ExternalProject_independent-step-targets.rst b/Help/release/dev/ExternalProject_independent-step-targets.rst new file mode 100644 index 000..02e8db8 --- /dev/null +++ b/Help/release/dev/ExternalProject_independent-step-targets.rst @@ -0,0 +1,6 @@ +ExternalProject_independent-step-targets + + +* The :module:`ExternalProject` module learned options to create + independent external project step targets that do not depend + on the builtin steps. --- Summary of changes: Help/release/dev/ExternalProject_independent-step-targets.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/ExternalProject_independent-step-targets.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-303-g3d87239
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 3d872399f7eb537e5c518b3892040fea90bf57db (commit) via cfb3a869500209d1afd17b3d517ad968b226fc63 (commit) from d377a4d709f336104f8f281dcdfd91278a766d76 (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=3d872399f7eb537e5c518b3892040fea90bf57db commit 3d872399f7eb537e5c518b3892040fea90bf57db Merge: d377a4d cfb3a86 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:46:06 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 14:46:06 2014 -0500 Merge topic 'cpack-rpm-component-descriptions' into next cfb3a869 Help: Add notes for topic 'cpack-rpm-component-descriptions' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb3a869500209d1afd17b3d517ad968b226fc63 commit cfb3a869500209d1afd17b3d517ad968b226fc63 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:38:59 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 14:38:59 2014 -0500 Help: Add notes for topic 'cpack-rpm-component-descriptions' diff --git a/Help/release/dev/cpack-rpm-component-descriptions.rst b/Help/release/dev/cpack-rpm-component-descriptions.rst new file mode 100644 index 000..769a912 --- /dev/null +++ b/Help/release/dev/cpack-rpm-component-descriptions.rst @@ -0,0 +1,7 @@ +cpack-rpm-component-descriptions + + +* The :module:`CPackRPM` module learned options to set per-component + descriptions and summaries. See the + :variable:`CPACK_RPM_component_PACKAGE_DESCRIPTION` and + :variable:`CPACK_RPM_component_PACKAGE_SUMMARY` variables. --- Summary of changes: Help/release/dev/cpack-rpm-component-descriptions.rst |7 +++ 1 file changed, 7 insertions(+) create mode 100644 Help/release/dev/cpack-rpm-component-descriptions.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-305-gaa8908e
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 aa8908efd51c8172fe66af931f35d55c5db61af2 (commit) via df720de23415e9df29faf3b26b55a9d0f2c98f8a (commit) from 3d872399f7eb537e5c518b3892040fea90bf57db (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=aa8908efd51c8172fe66af931f35d55c5db61af2 commit aa8908efd51c8172fe66af931f35d55c5db61af2 Merge: 3d87239 df720de Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:46:08 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 14:46:08 2014 -0500 Merge topic 'ctest-delphi-coverage' into next df720de2 Help: Add notes for topic 'ctest-delphi-coverage' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df720de23415e9df29faf3b26b55a9d0f2c98f8a commit df720de23415e9df29faf3b26b55a9d0f2c98f8a Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 13:03:22 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 13:03:22 2014 -0500 Help: Add notes for topic 'ctest-delphi-coverage' diff --git a/Help/release/dev/ctest-delphi-coverage.rst b/Help/release/dev/ctest-delphi-coverage.rst new file mode 100644 index 000..efa97c9 --- /dev/null +++ b/Help/release/dev/ctest-delphi-coverage.rst @@ -0,0 +1,4 @@ +ctest-delphi-coverage +- + +* The :command:`ctest_coverage` learned to support Delphi coverage. --- Summary of changes: Help/release/dev/ctest-delphi-coverage.rst |4 1 file changed, 4 insertions(+) create mode 100644 Help/release/dev/ctest-delphi-coverage.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-299-gf030b30
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 f030b3070b5be3d274526cca6a062a9a407c (commit) via c236b1605056d76d19b2bba7288ebdf7b67c7fbe (commit) from 335e3c86608b67db57ca0567b7d8018c10c24468 (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=f030b3070b5be3d274526cca6a062a9a407c commit f030b3070b5be3d274526cca6a062a9a407c Merge: 335e3c8 c236b16 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:46:03 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 14:46:03 2014 -0500 Merge topic 'add_javascript_coverage_parser' into next c236b160 Help: Add notes for topic 'add_javascript_coverage_parser' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c236b1605056d76d19b2bba7288ebdf7b67c7fbe commit c236b1605056d76d19b2bba7288ebdf7b67c7fbe Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:43:14 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 14:43:14 2014 -0500 Help: Add notes for topic 'add_javascript_coverage_parser' diff --git a/Help/release/dev/add_javascript_coverage_parser.rst b/Help/release/dev/add_javascript_coverage_parser.rst new file mode 100644 index 000..0d068ee --- /dev/null +++ b/Help/release/dev/add_javascript_coverage_parser.rst @@ -0,0 +1,4 @@ +add_javascript_coverage_parser +-- + +* The :command:`ctest_coverage` learned to support Javascript coverage. --- Summary of changes: Help/release/dev/add_javascript_coverage_parser.rst |4 1 file changed, 4 insertions(+) create mode 100644 Help/release/dev/add_javascript_coverage_parser.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-297-g335e3c8
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 335e3c86608b67db57ca0567b7d8018c10c24468 (commit) via 56f4949cbbdd2e10a9878c593e9d5fda2c4eba49 (commit) from d547aa15c3103804818c7f53e6c1695c2b1180f6 (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=335e3c86608b67db57ca0567b7d8018c10c24468 commit 335e3c86608b67db57ca0567b7d8018c10c24468 Merge: d547aa1 56f4949 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:46:02 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 14:46:02 2014 -0500 Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' into next 56f4949c Help: Add notes for topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56f4949cbbdd2e10a9878c593e9d5fda2c4eba49 commit 56f4949cbbdd2e10a9878c593e9d5fda2c4eba49 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:45:18 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 14:45:18 2014 -0500 Help: Add notes for topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' diff --git a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst b/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst new file mode 100644 index 000..1838ab6 --- /dev/null +++ b/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst @@ -0,0 +1,6 @@ +ExternalProject_CMAKE_CACHE_DEFAULT_ARGS + + +* The :module:`ExternalProject` module ``ExternalProject_Add`` function + learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache + values in the external project without setting them on future builds. --- Summary of changes: Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-301-gd377a4d
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 d377a4d709f336104f8f281dcdfd91278a766d76 (commit) via 6e927fafffebccd5e7675154db805f104059996c (commit) from f030b3070b5be3d274526cca6a062a9a407c (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=d377a4d709f336104f8f281dcdfd91278a766d76 commit d377a4d709f336104f8f281dcdfd91278a766d76 Merge: f030b30 6e927fa Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:46:05 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 14:46:05 2014 -0500 Merge topic 'cpack-rpm-pre-post-install' into next 6e927faf Help: Add notes for topic 'cpack-rpm-pre-post-install' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e927fafffebccd5e7675154db805f104059996c commit 6e927fafffebccd5e7675154db805f104059996c Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 14:41:55 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 14:41:55 2014 -0500 Help: Add notes for topic 'cpack-rpm-pre-post-install' diff --git a/Help/release/dev/cpack-rpm-pre-post-install.rst b/Help/release/dev/cpack-rpm-pre-post-install.rst new file mode 100644 index 000..0909d94 --- /dev/null +++ b/Help/release/dev/cpack-rpm-pre-post-install.rst @@ -0,0 +1,12 @@ +cpack-rpm-pre-post-install +-- + +* The :module:`CPackRPM` module learned options to specify + requirements for pre- and post-install scripts. See the + :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and + :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables. + +* The :module:`CPackRPM` module learned options to specify + requirements for pre- and post-uninstall scripts. See the + :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and + :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables. --- Summary of changes: Help/release/dev/cpack-rpm-pre-post-install.rst | 12 1 file changed, 12 insertions(+) create mode 100644 Help/release/dev/cpack-rpm-pre-post-install.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-120-g32b4857
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 32b48579b637eb396a88fbb7943759e900a49d80 (commit) via 56f4949cbbdd2e10a9878c593e9d5fda2c4eba49 (commit) from 38be87caa4c1470151d012e46c70f09bcbe7d334 (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=32b48579b637eb396a88fbb7943759e900a49d80 commit 32b48579b637eb396a88fbb7943759e900a49d80 Merge: 38be87c 56f4949 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:30 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:30 2014 -0500 Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' 56f4949c Help: Add notes for topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' --- Summary of changes: Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-131-g34c16c5
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 34c16c55580a2f03f0b180304801b8306e9cc23e (commit) via 5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8 (commit) via 72b5b48040ed65fdb54b8ffeb3326b456586b8c8 (commit) from 8640dc54d190e44a41bed9fbc05267e4f4ff887a (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=34c16c55580a2f03f0b180304801b8306e9cc23e commit 34c16c55580a2f03f0b180304801b8306e9cc23e Merge: 8640dc5 5868b4e Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:41 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:41 2014 -0500 Merge topic 'update-kwsys' 5868b4e2 Merge branch 'upstream-kwsys' into update-kwsys 72b5b480 KWSys 2014-10-31 (88c8cc7f) --- Summary of changes: Source/kwsys/CMakeLists.txt|4 +- Source/kwsys/Directory.hxx.in |2 - Source/kwsys/DynamicLoader.cxx | 66 +- Source/kwsys/DynamicLoader.hxx.in | 15 ++- Source/kwsys/Glob.cxx |2 +- Source/kwsys/SystemInformation.cxx |6 +- Source/kwsys/SystemTools.cxx | 233 +--- Source/kwsys/SystemTools.hxx.in| 51 +--- Source/kwsys/testSystemTools.cxx |4 +- 9 files changed, 249 insertions(+), 134 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-138-geb505ef
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 eb505ef32b09552bc6e4445f193ae3823025aab8 (commit) via 01fb3190f2070e3e747bbeca3ec9f797d4ebe774 (commit) from 190fdec8572ad6d2398e06954d4b7bdf0f212929 (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=eb505ef32b09552bc6e4445f193ae3823025aab8 commit eb505ef32b09552bc6e4445f193ae3823025aab8 Merge: 190fdec 01fb319 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:47 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:47 2014 -0500 Merge topic 'FindIce-no-envvar-markup' 01fb3190 FindIce: Drop use of :envvar: Sphinx markup --- Summary of changes: Modules/FindIce.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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-128-g8640dc5
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 8640dc54d190e44a41bed9fbc05267e4f4ff887a (commit) via df720de23415e9df29faf3b26b55a9d0f2c98f8a (commit) from 092dfdd238503de5579f5559ed5d8d1ed7072d4e (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=8640dc54d190e44a41bed9fbc05267e4f4ff887a commit 8640dc54d190e44a41bed9fbc05267e4f4ff887a Merge: 092dfdd df720de Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:39 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:39 2014 -0500 Merge topic 'ctest-delphi-coverage' df720de2 Help: Add notes for topic 'ctest-delphi-coverage' --- Summary of changes: Help/release/dev/ctest-delphi-coverage.rst |4 1 file changed, 4 insertions(+) create mode 100644 Help/release/dev/ctest-delphi-coverage.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-145-gdb3cfc3
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 db3cfc3376f2021f7c80ba220ecada64832b5ee1 (commit) via 468fb734b4462c2c338abff8140f90a3c9d213a5 (commit) via 67cfbf8eb7cb2ad0e177b68aa134bc65297929fb (commit) via f598f1aa836f7c9a60bc59b53ebbc2faae24f5a4 (commit) via 4ae133e09c763beb5a55302fdc1502abff6ff8d3 (commit) from ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 (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=db3cfc3376f2021f7c80ba220ecada64832b5ee1 commit db3cfc3376f2021f7c80ba220ecada64832b5ee1 Merge: ac88ce2 468fb73 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:51 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:51 2014 -0500 Merge topic 'ExternalProject_independent-step-targets' 468fb734 Help: Add notes for topic 'ExternalProject_independent-step-targets' 67cfbf8e ExternalProject: Add unit tests f598f1aa ExternalProject: Add ExternalProject_Add_StepDependencies function 4ae133e0 ExternalProject: Add independent step targets --- Summary of changes: .../ExternalProject_independent-step-targets.rst |6 + Modules/ExternalProject.cmake | 131 +--- Tests/ExternalProjectUpdate/CMakeLists.txt |3 +- .../ExternalProject/Add_StepDependencies.cmake | 20 +++ .../Add_StepDependencies_no_target.cmake | 10 ++ .../RunCMake/ExternalProject/NO_DEPENDS-stderr.txt | 36 ++ Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake| 18 +++ Tests/RunCMake/ExternalProject/RunCMakeTest.cmake |3 + 8 files changed, 211 insertions(+), 16 deletions(-) create mode 100644 Help/release/dev/ExternalProject_independent-step-targets.rst create mode 100644 Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake create mode 100644 Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake create mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt create mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-136-g190fdec
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 190fdec8572ad6d2398e06954d4b7bdf0f212929 (commit) via eaf6f67f67e12c4e137c8e875ac277072bf910b6 (commit) via 45a25d63ba738e8b0ce690f8f02469a82815b5f4 (commit) from 5204329315453687e6d1b0fa4b802871cf4534dd (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=190fdec8572ad6d2398e06954d4b7bdf0f212929 commit 190fdec8572ad6d2398e06954d4b7bdf0f212929 Merge: 5204329 eaf6f67 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:45 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:45 2014 -0500 Merge topic 'extra-generators-std-flags' eaf6f67f Code Blocks/Eclipse: Add -std= flag matching. 45a25d63 Code Blocks/Eclipse: Use non-default stdlib includes when specified. --- Summary of changes: ...eExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake |9 - 1 file changed, 8 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-140-gac88ce2
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 ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 (commit) via 996f822930b02fbf6f7b1bc2fa21ad52b10ebdcd (commit) from eb505ef32b09552bc6e4445f193ae3823025aab8 (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=ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 commit ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 Merge: eb505ef 996f822 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:49 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:49 2014 -0500 Merge topic 'fix-missing-SIZE_MAX' 996f8229 liblzma: fix build on platforms with no SIZE_MAX defined. --- Summary of changes: Utilities/cmliblzma/CMakeLists.txt |1 + Utilities/cmliblzma/common/sysdefs.h |4 ++-- Utilities/cmliblzma/config.h.in |4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-122-g66158b6
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 66158b6753fe55a42da4a58d8cac90210604fccd (commit) via c236b1605056d76d19b2bba7288ebdf7b67c7fbe (commit) from 32b48579b637eb396a88fbb7943759e900a49d80 (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=66158b6753fe55a42da4a58d8cac90210604fccd commit 66158b6753fe55a42da4a58d8cac90210604fccd Merge: 32b4857 c236b16 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:32 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:32 2014 -0500 Merge topic 'add_javascript_coverage_parser' c236b160 Help: Add notes for topic 'add_javascript_coverage_parser' --- Summary of changes: Help/release/dev/add_javascript_coverage_parser.rst |4 1 file changed, 4 insertions(+) create mode 100644 Help/release/dev/add_javascript_coverage_parser.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-126-g092dfdd
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 092dfdd238503de5579f5559ed5d8d1ed7072d4e (commit) via cfb3a869500209d1afd17b3d517ad968b226fc63 (commit) from f81af6f52618e1220a20c63b7841114493f2fbe3 (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=092dfdd238503de5579f5559ed5d8d1ed7072d4e commit 092dfdd238503de5579f5559ed5d8d1ed7072d4e Merge: f81af6f cfb3a86 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:37 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:37 2014 -0500 Merge topic 'cpack-rpm-component-descriptions' cfb3a869 Help: Add notes for topic 'cpack-rpm-component-descriptions' --- Summary of changes: Help/release/dev/cpack-rpm-component-descriptions.rst |7 +++ 1 file changed, 7 insertions(+) create mode 100644 Help/release/dev/cpack-rpm-component-descriptions.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-317-gccb0048
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 ccb0048e1f7ded2ec8924fee2cf9875a6e910f98 (commit) via db3cfc3376f2021f7c80ba220ecada64832b5ee1 (commit) via ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 (commit) via eb505ef32b09552bc6e4445f193ae3823025aab8 (commit) via 190fdec8572ad6d2398e06954d4b7bdf0f212929 (commit) via 5204329315453687e6d1b0fa4b802871cf4534dd (commit) via 34c16c55580a2f03f0b180304801b8306e9cc23e (commit) via 8640dc54d190e44a41bed9fbc05267e4f4ff887a (commit) via 092dfdd238503de5579f5559ed5d8d1ed7072d4e (commit) via f81af6f52618e1220a20c63b7841114493f2fbe3 (commit) via 66158b6753fe55a42da4a58d8cac90210604fccd (commit) via 32b48579b637eb396a88fbb7943759e900a49d80 (commit) from aa8908efd51c8172fe66af931f35d55c5db61af2 (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=ccb0048e1f7ded2ec8924fee2cf9875a6e910f98 commit ccb0048e1f7ded2ec8924fee2cf9875a6e910f98 Merge: aa8908e db3cfc3 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:10:00 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 15:10:00 2014 -0500 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-124-gf81af6f
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 f81af6f52618e1220a20c63b7841114493f2fbe3 (commit) via 6e927fafffebccd5e7675154db805f104059996c (commit) from 66158b6753fe55a42da4a58d8cac90210604fccd (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=f81af6f52618e1220a20c63b7841114493f2fbe3 commit f81af6f52618e1220a20c63b7841114493f2fbe3 Merge: 66158b6 6e927fa Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:35 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:35 2014 -0500 Merge topic 'cpack-rpm-pre-post-install' 6e927faf Help: Add notes for topic 'cpack-rpm-pre-post-install' --- Summary of changes: Help/release/dev/cpack-rpm-pre-post-install.rst | 12 1 file changed, 12 insertions(+) create mode 100644 Help/release/dev/cpack-rpm-pre-post-install.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-133-g5204329
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 5204329315453687e6d1b0fa4b802871cf4534dd (commit) via 6b63942e45ebc8f542ef68359268e215da10c611 (commit) from 34c16c55580a2f03f0b180304801b8306e9cc23e (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=5204329315453687e6d1b0fa4b802871cf4534dd commit 5204329315453687e6d1b0fa4b802871cf4534dd Merge: 34c16c5 6b63942 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:09:43 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 4 15:09:43 2014 -0500 Merge topic 'watcom-drop-symfile-option' 6b63942e Watcom: Drop symfile linker option --- Summary of changes: Modules/Platform/Windows-wcl386.cmake |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-321-g4a91ac2
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 4a91ac27ebb8d356407c45b92d0e23d845e5ccd8 (commit) via f45cefde59f9be7a021ff3f183b785f20ac62d1a (commit) via 4cc2d9b3a600b01259006f4ca4dd72f77a55da90 (commit) via 1ee161cf26d2366ab7dce349b17de305013eec98 (commit) from ccb0048e1f7ded2ec8924fee2cf9875a6e910f98 (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=4a91ac27ebb8d356407c45b92d0e23d845e5ccd8 commit 4a91ac27ebb8d356407c45b92d0e23d845e5ccd8 Merge: ccb0048 f45cefd Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 4 15:11:26 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 4 15:11:26 2014 -0500 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-148-gf45cefd
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 f45cefde59f9be7a021ff3f183b785f20ac62d1a (commit) via 4cc2d9b3a600b01259006f4ca4dd72f77a55da90 (commit) via 1ee161cf26d2366ab7dce349b17de305013eec98 (commit) from db3cfc3376f2021f7c80ba220ecada64832b5ee1 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-325-gce12801
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 ce1280163f2d9000376c863f8967c3e31529eba5 (commit)
via 06cdab9593119137ab7139a1c9d410063770da1c (commit)
from 294e70c79a1611c0a58e7d82158afa203d57288c (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=ce1280163f2d9000376c863f8967c3e31529eba5
commit ce1280163f2d9000376c863f8967c3e31529eba5
Merge: 294e70c 06cdab9
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Nov 4 16:38:38 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 4 16:38:38 2014 -0500
Merge topic 'file-GENERATE-permissions' into next
06cdab95 Add tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06cdab9593119137ab7139a1c9d410063770da1c
commit 06cdab9593119137ab7139a1c9d410063770da1c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jul 22 15:10:57 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Nov 4 22:38:07 2014 +0100
Add tests.
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
b/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
new file mode 100644
index 000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions.cmake
b/Tests/RunCMake/File_Generate/CarryPermissions.cmake
new file mode 100644
index 000..a04334f
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions.cmake
@@ -0,0 +1,5 @@
+
+file(GENERATE
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output_script.sh
+ INPUT ${CMAKE_CURRENT_SOURCE_DIR}/input_script.sh
+)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index dee0692..578df81 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -35,3 +35,21 @@ unset(RunCMake_TEST_NO_CLEAN)
if (NOT timestamp_after STREQUAL timestamp)
message(SEND_ERROR WriteIfDifferent changed output file.)
endif()
+
+if (UNIX AND EXISTS /bin/sh)
+ set(RunCMake_TEST_NO_CLEAN ON)
+ run_cmake(CarryPermissions)
+ execute_process(
+COMMAND ${RunCMake_BINARY_DIR}/CarryPermissions-build/output_script.sh
+OUTPUT_VARIABLE script_output
+RESULT_VARIABLE script_result
+ERROR_VARIABLE script_error
+OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ if (script_result)
+message(SEND_ERROR Generated script did not execute correctly:
[${script_result}]\n${script_output}\n\n${script_error})
+ endif()
+ if (NOT script_output STREQUAL SUCCESS)
+message(SEND_ERROR Generated script did not execute
correctly:\n${script_output}\n\n${script_error})
+ endif()
+endif()
diff --git a/Tests/RunCMake/File_Generate/input_script.sh
b/Tests/RunCMake/File_Generate/input_script.sh
new file mode 100755
index 000..2cc0983
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/input_script.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo $$STREQUAL:foo,foo:SUCCESS
---
Summary of changes:
.../CarryPermissions-result.txt} |0
.../CarryPermissions-stderr.txt} |0
Tests/RunCMake/File_Generate/CarryPermissions.cmake |5 +
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 18 ++
.../File_Generate/input_script.sh} |3 ++-
5 files changed, 25 insertions(+), 1 deletion(-)
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =
File_Generate/CarryPermissions-result.txt} (100%)
copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt =
File_Generate/CarryPermissions-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/CarryPermissions.cmake
copy Tests/{OutOfBinary/CMakeLists.txt =
RunCMake/File_Generate/input_script.sh} (61%)
mode change 100644 = 100755
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-323-g294e70c
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 294e70c79a1611c0a58e7d82158afa203d57288c (commit)
via c15764a69202cf6837dd0332adbba56dfa11bbd7 (commit)
from 4a91ac27ebb8d356407c45b92d0e23d845e5ccd8 (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=294e70c79a1611c0a58e7d82158afa203d57288c
commit 294e70c79a1611c0a58e7d82158afa203d57288c
Merge: 4a91ac2 c15764a
Author: Chuck Atkins chuck.atk...@kitware.com
AuthorDate: Tue Nov 4 16:38:37 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 4 16:38:37 2014 -0500
Merge topic 'fix-gcc-hppa' into next
c15764a6 Workaround for short jump tables on PA-RISC.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c15764a69202cf6837dd0332adbba56dfa11bbd7
commit c15764a69202cf6837dd0332adbba56dfa11bbd7
Author: Chuck Atkins chuck.atk...@kitware.com
AuthorDate: Tue Nov 4 11:01:56 2014 -0500
Commit: Chuck Atkins chuck.atk...@kitware.com
CommitDate: Tue Nov 4 16:34:59 2014 -0500
Workaround for short jump tables on PA-RISC.
The PA-RISC architecture requires special options for GCC to prevent
linker errors when libraries reach a certain size and / or complexity.
See http://mraw.org/blog/2007/10/10/Linking_on_hppa and gcc
documentation on -mlong-calls.
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 5d86876..79f89d0 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -65,6 +65,16 @@ if(CMAKE_SYSTEM_NAME MATCHES HP-UX AND
CMAKE_CXX_COMPILER_ID MATCHES HP)
endif()
endif()
+# Workaround for short jump tables on PA-RISC
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
+ if(CMAKE_COMPILER_IS_GNUC)
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mlong-calls)
+ endif()
+ if(CMAKE_COMPILER_IS_GNUCXX)
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -mlong-calls)
+ endif()
+endif()
+
# use the ansi CXX compile flag for building cmake
if (CMAKE_ANSI_CXXFLAGS)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS})
@@ -74,10 +84,4 @@ if (CMAKE_ANSI_CFLAGS)
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS})
endif ()
-# avoid binutils problem with large binaries, e.g. when building CMake in
debug mode
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
-if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL
parisc)
- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*)
-endif ()
-
include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
diff --git a/bootstrap b/bootstrap
index b09023d..904e6be 100755
--- a/bootstrap
+++ b/bootstrap
@@ -744,11 +744,13 @@ if ${cmake_system_haiku}; then
cmake_ld_flags=${LDFLAGS} -lroot -lbe
fi
-if ${cmake_system_linux}; then
- # avoid binutils problem with large binaries, e.g. when building CMake in
debug mode
- # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
- if ${cmake_machine_parisc}; then
-cmake_ld_flags=${LDFLAGS} -Wl,--unique=.text._*
+# Workaround for short jump tables on PA-RISC
+if ${cmake_machine_parisc}; then
+ if ${cmake_c_compiler_is_gnu}; then
+cmake_c_flags=${CFLAGS} -mlong-calls
+ fi
+ if ${cmake_cxx_compiler_is_gnu}; then
+cmake_cxx_flags=${CXXFLAGS} -mlong-calls
fi
fi
---
Summary of changes:
CompileFlags.cmake |6 --
bootstrap | 12 +++-
2 files changed, 7 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-327-g4f111cd
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 4f111cd25372b15b7e9f6373d08559edcd7c3792 (commit)
via 81afbbc09bac6913e2b83f7eb68923ff5b1911d5 (commit)
from ce1280163f2d9000376c863f8967c3e31529eba5 (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=4f111cd25372b15b7e9f6373d08559edcd7c3792
commit 4f111cd25372b15b7e9f6373d08559edcd7c3792
Merge: ce12801 81afbbc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Nov 4 16:39:00 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 4 16:39:00 2014 -0500
Merge topic 'file-GENERATE-permissions' into next
81afbbc0 file(GENERATE): Use permissions of input file if present.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81afbbc09bac6913e2b83f7eb68923ff5b1911d5
commit 81afbbc09bac6913e2b83f7eb68923ff5b1911d5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jul 22 15:10:57 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Nov 4 22:38:22 2014 +0100
file(GENERATE): Use permissions of input file if present.
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx
b/Source/cmGeneratorExpressionEvaluationFile.cxx
index f9067cf..3a8dc48 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -36,7 +36,7 @@
cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile(
//
void cmGeneratorExpressionEvaluationFile::Generate(const std::string config,
cmCompiledGeneratorExpression* inputExpression,
- std::mapstd::string, std::string outputFiles)
+ std::mapstd::string, std::string outputFiles, mode_t perm)
{
std::string rawCondition = this-Condition-GetInput();
if (!rawCondition.empty())
@@ -83,11 +83,16 @@ void cmGeneratorExpressionEvaluationFile::Generate(const
std::string config,
cmGeneratedFileStream fout(outputFileName.c_str());
fout.SetCopyIfDifferent(true);
fout outputContent;
+ if (fout.Close() perm)
+{
+cmSystemTools::SetPermissions(outputFileName.c_str(), perm);
+}
}
//
void cmGeneratorExpressionEvaluationFile::Generate()
{
+ mode_t perm = 0;
std::string inputContent;
if (this-InputIsContent)
{
@@ -95,6 +100,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
}
else
{
+cmSystemTools::GetPermissions(this-Input.c_str(), perm);
cmsys::ifstream fin(this-Input.c_str());
if(!fin)
{
@@ -131,7 +137,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
for(std::vectorstd::string::const_iterator li = allConfigs.begin();
li != allConfigs.end(); ++li)
{
-this-Generate(*li, inputExpression.get(), outputFiles);
+this-Generate(*li, inputExpression.get(), outputFiles, perm);
if(cmSystemTools::GetFatalErrorOccured())
{
return;
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h
b/Source/cmGeneratorExpressionEvaluationFile.h
index f939916..4e87a88 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -34,7 +34,7 @@ public:
private:
void Generate(const std::string config,
cmCompiledGeneratorExpression* inputExpression,
- std::mapstd::string, std::string outputFiles);
+ std::mapstd::string, std::string outputFiles, mode_t perm);
private:
const std::string Input;
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
b/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
new file mode 100644
index 000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions.cmake
b/Tests/RunCMake/File_Generate/CarryPermissions.cmake
new file mode 100644
index 000..a04334f
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions.cmake
@@ -0,0 +1,5 @@
+
+file(GENERATE
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output_script.sh
+ INPUT ${CMAKE_CURRENT_SOURCE_DIR}/input_script.sh
+)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-149-gd5a373a
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 d5a373a10d530c797a00b3f7b815fa68cca24510 (commit) from f45cefde59f9be7a021ff3f183b785f20ac62d1a (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=d5a373a10d530c797a00b3f7b815fa68cca24510 commit d5a373a10d530c797a00b3f7b815fa68cca24510 Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Nov 5 00:01:08 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Nov 5 00:01:08 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4743c2e..b2a0f46 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 1) -set(CMake_VERSION_PATCH 20141104) +set(CMake_VERSION_PATCH 20141105) #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/mailman/listinfo/cmake-commits
