Re: [cmake-developers] How to fix a commit to next?
On 09/08/2010 11:35 AM, Andreas Schneider wrote: On Tuesday 31 August 2010 03:07:16 Miguel A. Figueroa-Villanueva wrote: ...oo master . \ . ooo topic .\\ ...oooo *next, origin/next Is this what should be done in such cases? Is there a way to signal the first merge to next as one that should not be merged to master? Normally git rebase origin/next is your friend to come back and get a nice o---o---o---o---o Yes, but: (1) Once the topic has been published it should not be rewritten (2) No work should be based or rebased on next -Brad ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] Loop expansion in find_library() seems backwards
Let's say I have many different potential names for a library and the
following filesystem
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
find_library(TEST_LIBRARY
NAMES nspr4 nspr4a
HINTS ${CMAKE_CURRENT_SOURCE_DIR}
)
I'm somewhat surprised that the following code finds /usr/lib/libnspr4.so
instead of the alternate name for it (libnspr4a.so). This tells me that the
loop is backwards. Shouldn't the find_library() command be iterating the
list of library names across each directory. For example, the above should
search:
First ${CMAKE_CURRENT_SOURCE_DIR}...
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
Then the system directories...
(system paths)/lib/libnspr4.so
(system paths)/lib/libnspr4a.so
Etc.
The system is actually searching
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
/usr/lib/libnspr4a.so
This is with CMake 2.8.2
--
Philip Lowman
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Loop expansion in find_library() seems backwards
On 8. Sep, 2010, at 8:25 , Philip Lowman wrote:
Let's say I have many different potential names for a library and the
following filesystem
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
find_library(TEST_LIBRARY
NAMES nspr4 nspr4a
HINTS ${CMAKE_CURRENT_SOURCE_DIR}
)
I'm somewhat surprised that the following code finds /usr/lib/libnspr4.so
instead of the alternate name for it (libnspr4a.so). This tells me that the
loop is backwards. Shouldn't the find_library() command be iterating the
list of library names across each directory. For example, the above should
search:
First ${CMAKE_CURRENT_SOURCE_DIR}...
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
Then the system directories...
(system paths)/lib/libnspr4.so
(system paths)/lib/libnspr4a.so
Etc.
The system is actually searching
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
/usr/lib/libnspr4a.so
This is with CMake 2.8.2
--
Philip Lowman
Oh, no! This topic haunts the list ;-) See
http://www.mail-archive.com/cmake@cmake.org/msg30602.html
http://www.mail-archive.com/cmake@cmake.org/msg28946.html
http://www.mail-archive.com/cmake@cmake.org/msg27838.html
http://www.mail-archive.com/cmake@cmake.org/msg24565.html
Michael
--
There is always a well-known solution to every human problem -- neat,
plausible, and wrong.
H. L. Mencken
PGP.sig
Description: This is a digitally signed message part
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Auto re-configuring until cache stops changing
Hi, What I meant was that the curses and Qt UI's should behave more like 'cmake'. What does cmake actually do? The following code runs into an infinite loop on ccmake (like intended), but cmake seems to finish after the first pass (it just prints out on once), though there is a newly introduced cache variable on every run. SET (FOOBAR OFF CACHE BOOL bla) IF (NOT FOOBAR) SET (FOOBAR ON CACHE BOOL bla FORCE) SET (BLA ON CACHE BOOL foobar) UNSET (FOO CACHE) MESSAGE (STATUS on) ELSE() SET (FOOBAR OFF CACHE BOOL bla FORCE) UNSET (BLA CACHE) SET (FOO ON CACHE BOOL barfoo) MESSAGE (STATUS off) ENDIF(NOT FOOBAR) Andreas ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Volunteering to become maintainer of FindSubversion.cmake
Hi all, I would like to inform you that I'm volunteering to become the maintainer of FindSubversion.cmake. Best regards, Marcel Loose. ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Auto re-configuring until cache stops changing
On Wed, Sep 8, 2010 at 3:43 AM, Diablo 666 thediablo...@hotmail.de wrote: Hi, What I meant was that the curses and Qt UI's should behave more like 'cmake'. What does cmake actually do? The following code runs into an infinite loop on ccmake (like intended), but cmake seems to finish after the first pass (it just prints out on once), though there is a newly introduced cache variable on every run. SET (FOOBAR OFF CACHE BOOL bla) IF (NOT FOOBAR) SET (FOOBAR ON CACHE BOOL bla FORCE) SET (BLA ON CACHE BOOL foobar) UNSET (FOO CACHE) MESSAGE (STATUS on) ELSE() SET (FOOBAR OFF CACHE BOOL bla FORCE) UNSET (BLA CACHE) SET (FOO ON CACHE BOOL barfoo) MESSAGE (STATUS off) ENDIF(NOT FOOBAR) Andreas ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake cmake configures exactly once and generates at the end of that configure, regardless of any now new options or settings. If you run it again, it will do the same again, and in your case, you should see the off message on the 2nd run. ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Loop expansion in find_library() seems backwards
Wow, that's pretty bad. I even replied to one of those threads. Sorry for
the noise. The official bug post for this issue is here:
http://public.kitware.com/Bug/view.php?id=10718
I agree with Alan Irwin that it will continue to haunt users well into the
future.
On Wed, Sep 8, 2010 at 2:38 AM, Michael Wild them...@gmail.com wrote:
On 8. Sep, 2010, at 8:25 , Philip Lowman wrote:
Let's say I have many different potential names for a library and the
following filesystem
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
find_library(TEST_LIBRARY
NAMES nspr4 nspr4a
HINTS ${CMAKE_CURRENT_SOURCE_DIR}
)
I'm somewhat surprised that the following code finds /usr/lib/libnspr4.so
instead of the alternate name for it (libnspr4a.so). This tells me that
the
loop is backwards. Shouldn't the find_library() command be iterating the
list of library names across each directory. For example, the above
should
search:
First ${CMAKE_CURRENT_SOURCE_DIR}...
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
Then the system directories...
(system paths)/lib/libnspr4.so
(system paths)/lib/libnspr4a.so
Etc.
The system is actually searching
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
/usr/lib/libnspr4a.so
This is with CMake 2.8.2
--
Philip Lowman
Oh, no! This topic haunts the list ;-) See
http://www.mail-archive.com/cmake@cmake.org/msg30602.html
http://www.mail-archive.com/cmake@cmake.org/msg28946.html
http://www.mail-archive.com/cmake@cmake.org/msg27838.html
http://www.mail-archive.com/cmake@cmake.org/msg24565.html
Michael
--
There is always a well-known solution to every human problem -- neat,
plausible, and wrong.
H. L. Mencken
--
Philip Lowman
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Loop expansion in find_library() seems backwards
On 09/08/2010 08:38 AM, Michael Wild wrote:
On 8. Sep, 2010, at 8:25 , Philip Lowman wrote:
Let's say I have many different potential names for a library and the
following filesystem
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
find_library(TEST_LIBRARY
NAMES nspr4 nspr4a
HINTS ${CMAKE_CURRENT_SOURCE_DIR}
)
I'm somewhat surprised that the following code finds /usr/lib/libnspr4.so
instead of the alternate name for it (libnspr4a.so). This tells me that the
loop is backwards. Shouldn't the find_library() command be iterating the
list of library names across each directory. For example, the above should
search:
First ${CMAKE_CURRENT_SOURCE_DIR}...
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
Then the system directories...
(system paths)/lib/libnspr4.so
(system paths)/lib/libnspr4a.so
Etc.
The system is actually searching
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4.so
/usr/lib/libnspr4.so
${CMAKE_CURRENT_SOURCE_DIR}/libnspr4a.so
/usr/lib/libnspr4a.so
This is with CMake 2.8.2
--
Philip Lowman
Oh, no! This topic haunts the list [...]
...which shows that 10718 is still alive. ;-)
Hi Philip,
what's your opinion on this topic, in particular
- swapping loops and the required effort, the related risks
and the expected results,
- find modules with hardcoded magic numbers and the continuous
need for maintenance,
- globbing or regex support for FIND_{PROGRAM,LIBRARY,PATH,FILE}?
Regards,
Michael
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Loop expansion in find_library() seems backwards
On Wed, Sep 8, 2010 at 8:56 AM, Michael Hertling mhertl...@online.dewrote:
...which shows that 10718 is still alive. ;-)
Hi Philip,
what's your opinion on this topic, in particular
- swapping loops and the required effort, the related risks
and the expected results,
I'd like to know if there is a use case for the existing behavior. I don't
really have an opinion if this should be enabled optionally or by default
(or via policy) yet.
- find modules with hardcoded magic numbers and the continuous
need for maintenance,
- globbing or regex support for FIND_{PROGRAM,LIBRARY,PATH,FILE}?
I've griped about this for a while. So much that I even started working on
a patch for the issue back when I had some free time last year (but never
finished). What little time I have these days to spend on CMake I choose to
spend on supporting find modules, so if anyone wants to take this over... It
was one approach for how to solve the version number problem...
http://www.cmake.org/Bug/view.php?id=8396
--
Philip Lowman
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Newbie questions: verbosity and compiler invocation
Hi I am experimenting with using CMake to replace our manually written gnu makefiles on Linux. I have a couple of questions: 1) VERBOSITY I would like to see the compiler command on the console when running make. I know that one can run: make VERBOSE=1 but that displays a lot of detail, for example: make[1]: Entering directory ... Is there a way that I reduce the commentary to just show the compiler commands? For example: /usr/bin/c++ -o CMakeFiles/Kernel.dir/ErrorHandler.cpp.o -c /mypath/Kernel/ErrorHandler.cpp 2) COMPILER As shown above, cmake is invoking: /usr/bin/c++ I don't know what this tool is. How can I specify to use /usr/bin/g++ ? Best regards David ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Newbie questions: verbosity and compiler invocation
On 8. Sep, 2010, at 16:33 , David Aldrich wrote: Hi I am experimenting with using CMake to replace our manually written gnu makefiles on Linux. I have a couple of questions: 1) VERBOSITY I would like to see the compiler command on the console when running make. I know that one can run: make VERBOSE=1 but that displays a lot of detail, for example: make[1]: Entering directory ... Is there a way that I reduce the commentary to just show the compiler commands? For example: /usr/bin/c++ -o CMakeFiles/Kernel.dir/ErrorHandler.cpp.o -c /mypath/Kernel/ErrorHandler.cpp AFAIK there's no way to do that (apart from writing a wrapper script which echoes the command to stdout and then invokes it). 2) COMPILER As shown above, cmake is invoking: /usr/bin/c++ I don't know what this tool is. How can I specify to use /usr/bin/g++ ? Best regards David The first time you invoke CMake, do it like this: CC=/usr/bin/gcc CXX=/usr/bin/g++ cmake /path/to/source Alternatively, you can pass -DCMAKE_C_COMPILER=/usr/bin/gcc to the cmake program (similarly CMAKE_CXX_COMPILER for the c++ compiler), but that can have some nasty side-effects (e.g deleting and rebuilding the whole cache if it already exists). Usually, on Linux systems, /usr/bin/c++ is just another name for /usr/bin/g++. It is traditional to call the default C++ compiler /usr/bin/c++, such that hand-crafted Makefiles don't have to guess a name. Similarly, /usr/bin/cc is the default C compiler. Hope this clears things up a bit for you Michael -- There is always a well-known solution to every human problem -- neat, plausible, and wrong. H. L. Mencken PGP.sig Description: This is a digitally signed message part ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Newbie questions: verbosity and compiler invocation
Hi Michael Thanks for your answers. One other thing was worrying me. Currently, if a user changes our manually written makefile and checks it into svn, other users can do an svn update and then invoke make to construct a new build. If we move to cmake, users would modify and commit CMakeLists.txt. I was worried that they would then need to run cmake followed by make. They might forget to do both. But it seems that 'make' compares the timestamp of the generated makefile against that of CMakeLists.txt and rebuilds the makefile if it is older. Therefore, the developer would not need to run cmake, just 'make'. Am I correct? I guess the only new action in the workflow would be that a complete cmake command must be invoked on a freshly checked out working copy, if the build tree is in that working copy. Am I correct? Thanks David -Original Message- From: Michael Wild [mailto:them...@gmail.com] Sent: 08 September 2010 15:56 To: David Aldrich Cc: CMake@cmake.org Subject: Re: [CMake] Newbie questions: verbosity and compiler invocation On 8. Sep, 2010, at 16:33 , David Aldrich wrote: Hi I am experimenting with using CMake to replace our manually written gnu makefiles on Linux. I have a couple of questions: 1) VERBOSITY I would like to see the compiler command on the console when running make. I know that one can run: make VERBOSE=1 but that displays a lot of detail, for example: make[1]: Entering directory ... Is there a way that I reduce the commentary to just show the compiler commands? For example: /usr/bin/c++ -o CMakeFiles/Kernel.dir/ErrorHandler.cpp.o -c /mypath/Kernel/ErrorHandler.cpp AFAIK there's no way to do that (apart from writing a wrapper script which echoes the command to stdout and then invokes it). 2) COMPILER As shown above, cmake is invoking: /usr/bin/c++ I don't know what this tool is. How can I specify to use /usr/bin/g++ ? Best regards David The first time you invoke CMake, do it like this: CC=/usr/bin/gcc CXX=/usr/bin/g++ cmake /path/to/source Alternatively, you can pass -DCMAKE_C_COMPILER=/usr/bin/gcc to the cmake program (similarly CMAKE_CXX_COMPILER for the c++ compiler), but that can have some nasty side-effects (e.g deleting and rebuilding the whole cache if it already exists). Usually, on Linux systems, /usr/bin/c++ is just another name for /usr/bin/g++. It is traditional to call the default C++ compiler /usr/bin/c++, such that hand-crafted Makefiles don't have to guess a name. Similarly, /usr/bin/cc is the default C compiler. Hope this clears things up a bit for you Michael -- There is always a well-known solution to every human problem -- neat, plausible, and wrong. H. L. Mencken ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Newbie questions: verbosity and compiler invocation
Hi David Yes, this is correct. And before you even get the idea: Never add the CMake-generated files (Makefile, CMakeCache.txt, etc.) to your version control system. They are not relocatable. Michael On 8. Sep, 2010, at 17:23 , David Aldrich wrote: Hi Michael Thanks for your answers. One other thing was worrying me. Currently, if a user changes our manually written makefile and checks it into svn, other users can do an svn update and then invoke make to construct a new build. If we move to cmake, users would modify and commit CMakeLists.txt. I was worried that they would then need to run cmake followed by make. They might forget to do both. But it seems that 'make' compares the timestamp of the generated makefile against that of CMakeLists.txt and rebuilds the makefile if it is older. Therefore, the developer would not need to run cmake, just 'make'. Am I correct? I guess the only new action in the workflow would be that a complete cmake command must be invoked on a freshly checked out working copy, if the build tree is in that working copy. Am I correct? Thanks David -Original Message- From: Michael Wild [mailto:them...@gmail.com] Sent: 08 September 2010 15:56 To: David Aldrich Cc: CMake@cmake.org Subject: Re: [CMake] Newbie questions: verbosity and compiler invocation On 8. Sep, 2010, at 16:33 , David Aldrich wrote: Hi I am experimenting with using CMake to replace our manually written gnu makefiles on Linux. I have a couple of questions: 1) VERBOSITY I would like to see the compiler command on the console when running make. I know that one can run: make VERBOSE=1 but that displays a lot of detail, for example: make[1]: Entering directory ... Is there a way that I reduce the commentary to just show the compiler commands? For example: /usr/bin/c++ -o CMakeFiles/Kernel.dir/ErrorHandler.cpp.o -c /mypath/Kernel/ErrorHandler.cpp AFAIK there's no way to do that (apart from writing a wrapper script which echoes the command to stdout and then invokes it). 2) COMPILER As shown above, cmake is invoking: /usr/bin/c++ I don't know what this tool is. How can I specify to use /usr/bin/g++ ? Best regards David The first time you invoke CMake, do it like this: CC=/usr/bin/gcc CXX=/usr/bin/g++ cmake /path/to/source Alternatively, you can pass -DCMAKE_C_COMPILER=/usr/bin/gcc to the cmake program (similarly CMAKE_CXX_COMPILER for the c++ compiler), but that can have some nasty side-effects (e.g deleting and rebuilding the whole cache if it already exists). Usually, on Linux systems, /usr/bin/c++ is just another name for /usr/bin/g++. It is traditional to call the default C++ compiler /usr/bin/c++, such that hand-crafted Makefiles don't have to guess a name. Similarly, /usr/bin/cc is the default C compiler. Hope this clears things up a bit for you Michael -- There is always a well-known solution to every human problem -- neat, plausible, and wrong. H. L. Mencken -- There is always a well-known solution to every human problem -- neat, plausible, and wrong. H. L. Mencken PGP.sig Description: This is a digitally signed message part ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Newbie questions: verbosity and compiler invocation
Hi Michael Yes, this is correct. Thanks. And before you even get the idea: Never add the CMake-generated files (Makefile, CMakeCache.txt, etc.) to your version control system. They are not relocatable. Ah yes. You told me that before ;-) I will take your advice! David ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] How to change CMake's expected output filename
Hi there,
I'm using CMake with SDCC. Currently, support for SDCC in CMake does not also
include dialects for its various assemblers. So I've created one, for the
asx8051 assembler. The problem is that the asx8051 assembler shows nonstandard
behavior, and does not let you arbitrarily name the output. Instead, if you
compile myfile.a51, it produces myfile.rel. No option to change that.
CMake tells the linker to then look for an output file named
source_filenameCMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION, which ends up
looking for myfile.a51.rel. I can add whatever arbitrary extension I want, but
I need to strip the .a51 from CMake's expected output filename so it knows to
look for myfile.rel. Should I create a custom command which moves myfile.rel to
myfile.a51.rel? It seems unnecessarily Byzantine. Is there an easier way?
Thanks,
Nick
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] adding prebuilt .o files to a cmake.a
Folks, Is there an easy way (best practice) to add prebuilt .o files (external to my build) to a .a easily? -- Cheers, Timothy St. Clair ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] adding prebuilt .o files to a cmake.a
On Wed, Sep 8, 2010 at 4:54 PM, Tim St. Clair timoth...@gmail.com wrote:
Folks,
Is there an easy way (best practice) to add prebuilt .o files (external
to my build) to a .a easily?
--
Cheers,
Timothy St. Clair
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
If it's compatible with the other .o files being built to go in your
library, just add the .o file in question as a source file:
add_library(mylib /path/to/my.o ${other_sources})
HTH,
David
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to change CMake's expected output filename
On 09/08/2010 07:35 PM, Nick Foster wrote:
Hi there,
I'm using CMake with SDCC. Currently, support for SDCC in CMake does not also
include dialects for its various assemblers. So I've created one, for the
asx8051 assembler. The problem is that the asx8051 assembler shows
nonstandard behavior, and does not let you arbitrarily name the output.
Instead, if you compile myfile.a51, it produces myfile.rel. No option to
change that.
CMake tells the linker to then look for an output file named
source_filenameCMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION, which ends up
looking for myfile.a51.rel. I can add whatever arbitrary extension I want,
but I need to strip the .a51 from CMake's expected output filename so it
knows to look for myfile.rel. Should I create a custom command which moves
myfile.rel to myfile.a51.rel? It seems unnecessarily Byzantine. Is there an
easier way?
Possibly, you could tweak the CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT
variable; look at the following CMakeLists.txt for an example in C:
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
PROJECT(RENOBJ C)
FILE(WRITE ${CMAKE_BINARY_DIR}/renobj.cmake
GET_FILENAME_COMPONENT(NAME \${FILE} NAME)
STRING(REGEX REPLACE \.c.o\\$\ \.o\ LINK \${FILE})
EXECUTE_PROCESS(COMMAND
${CMAKE_COMMAND} -E create_symlink \${NAME} \${LINK})
)
SET(CMAKE_C_COMPILE_OBJECT ${CMAKE_C_COMPILE_OBJECT}
${CMAKE_COMMAND} -DFILE=OBJECT -P ${CMAKE_BINARY_DIR}/renobj.cmake)
FILE(WRITE ${CMAKE_BINARY_DIR}/main.c int main(void){return 0;}\n)
ADD_EXECUTABLE(main main.c)
The renobj.cmake script takes an object file name, replaces its .c.o
suffix by .o and creates a symlink to the original file. This script
is invoked as an additional command from the compilation rule variable.
Perhaps, that approach can be adapted to your case. Alternatively, you
might consider to use a link launcher, see RULE_LAUNCH_LINK properties
and [1] for an example.
Regards,
Michael
[1] http://www.mail-archive.com/cmake@cmake.org/msg29622.html
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] adding prebuilt .o files to a cmake.a
I guess a follow on to that would be the opposite to composition. If I
wanted to decompose a cmake library to determine what object files it
contains is there an easy mechanism for this?
Cheers,
Tim
On Wed, Sep 8, 2010 at 4:30 PM, David Cole david.c...@kitware.com wrote:
On Wed, Sep 8, 2010 at 4:54 PM, Tim St. Clair timoth...@gmail.com wrote:
Folks,
Is there an easy way (best practice) to add prebuilt .o files
(external to my build) to a .a easily?
--
Cheers,
Timothy St. Clair
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
If it's compatible with the other .o files being built to go in your
library, just add the .o file in question as a source file:
add_library(mylib /path/to/my.o ${other_sources})
HTH,
David
--
Cheers,
Timothy St. Clair
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.2-697-g8fe5c2a
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 8fe5c2ae216a2dbd61d671df5f436fe606924ca8 (commit) via 711c6103143fd55d029dace11cb14c2187c9d153 (commit) from 80c1bf5b25ae2af6f833631b6a954fb409e2ed57 (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=8fe5c2ae216a2dbd61d671df5f436fe606924ca8 commit 8fe5c2ae216a2dbd61d671df5f436fe606924ca8 Merge: 80c1bf5 711c610 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 10:40:28 2010 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Sep 8 10:40:28 2010 -0400 Merge branch 'master' into next --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-363-gc9b0e1d
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 c9b0e1da5cf449ad54f873bc2b4d45df9197efb5 (commit) via 013e0039eeb7e8bf213c3851161ce9a18f7b940d (commit) from 711c6103143fd55d029dace11cb14c2187c9d153 (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=c9b0e1da5cf449ad54f873bc2b4d45df9197efb5 commit c9b0e1da5cf449ad54f873bc2b4d45df9197efb5 Merge: 711c610 013e003 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:07:38 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:07:38 2010 -0400 Merge topic 'CPack-PreserveSymlinksInInstalledDirs-v2' 013e003 CPack handle symlinks in CPACK_INSTALLED_DIRECTORIES fix for bug5430 --- Summary of changes: Source/CPack/cmCPackGenerator.cxx | 44 - 1 files changed, 43 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-365-g81fa6bb
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 81fa6bbcc7daca38517da1f347de91d70db6a02f (commit) via 32242affea45eb3c3ffa2691657e970eaac49799 (commit) from c9b0e1da5cf449ad54f873bc2b4d45df9197efb5 (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=81fa6bbcc7daca38517da1f347de91d70db6a02f commit 81fa6bbcc7daca38517da1f347de91d70db6a02f Merge: c9b0e1d 32242af Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:07:51 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:07:51 2010 -0400 Merge topic 'ctest-show-labels' 32242af Added CTest command --print-labels --- Summary of changes: Source/CTest/cmCTestMultiProcessHandler.cxx | 42 +++ Source/CTest/cmCTestMultiProcessHandler.h |1 + Source/CTest/cmCTestTestHandler.cxx |9 - Source/cmCTest.cxx |6 Source/cmCTest.h|3 ++ Source/ctest.cxx|5 ++- Tests/CMakeLists.txt|5 +++ 7 files changed, 68 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-374-g4ea441e
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 4ea441eaf9a7a5dda266db9a6862fc9f8ed1c8cc (commit)
via 5cdfc9c8ea675658c14d21848917f0e2d9ab93da (commit)
via 4969c3b5bbf929d3f59e98c90849a85aadb7351a (commit)
via e8ae504c0e13a641660ae78a05d5a5184f352800 (commit)
via b4b8f963917b9473be283d5b844faee4a018945d (commit)
via cc955a042b582a12238cc94507bf50dd9bce1220 (commit)
via 0367245f0c1a665d44b7169cc0f24eda5dbb4de3 (commit)
via 130b0e21958535a4f4f408cf7392fa9b3ee336fe (commit)
via dfe9c95129b9ca05ea8ca98e69d973c9c40e5a4e (commit)
from 81fa6bbcc7daca38517da1f347de91d70db6a02f (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=4ea441eaf9a7a5dda266db9a6862fc9f8ed1c8cc
commit 4ea441eaf9a7a5dda266db9a6862fc9f8ed1c8cc
Merge: 81fa6bb 5cdfc9c
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Sep 8 11:07:55 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 8 11:07:55 2010 -0400
Merge topic 'ImproveFindPackageConfigMode'
5cdfc9c Improve wording of the error message of find_package() in
config-mode
4969c3b Improve version notice in the generated message
e8ae504 Add option CONFIG_MODE to FPHSA()
b4b8f96 Don't create an empty element at the end of
Foo_CONSIDERED_CONFIGS/VERSIONS
cc955a0 Small cleanup of FindPackageHandleStandardArgs.cmake
0367245 Replace the two vectorstring,string with one
vectorstruct{string,string}
130b0e2 Improve error message in Config-mode when no appropriate version
was found
dfe9c95 Record all considered Config files and their versions.
---
Summary of changes:
Modules/FindPackageHandleStandardArgs.cmake | 172 +--
Source/cmFindPackageCommand.cxx | 141 +-
Source/cmFindPackageCommand.h |6 +-
3 files changed, 224 insertions(+), 95 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-376-g2079424
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 2079424568d92b97bb4f56340271bd924f64722c (commit) via eae45a67e7901b9b5531a4cd49e9716e8edb3956 (commit) from 4ea441eaf9a7a5dda266db9a6862fc9f8ed1c8cc (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=2079424568d92b97bb4f56340271bd924f64722c commit 2079424568d92b97bb4f56340271bd924f64722c Merge: 4ea441e eae45a6 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:07:59 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:07:59 2010 -0400 Merge topic 'find-macports' eae45a6 Search MacPorts /opt/local prefix on Mac --- Summary of changes: Modules/Platform/Darwin.cmake|5 - Modules/Platform/UnixPaths.cmake |4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-378-g02e3f42
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 02e3f42a6a4bc2b94befd35c908750c10f612d44 (commit) via 3b7da5396d1c5085e4c55687877c89034e89c65e (commit) from 2079424568d92b97bb4f56340271bd924f64722c (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=02e3f42a6a4bc2b94befd35c908750c10f612d44 commit 02e3f42a6a4bc2b94befd35c908750c10f612d44 Merge: 2079424 3b7da53 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:08:01 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:08:01 2010 -0400 Merge topic 'watcom_fixes' 3b7da53 Fix for bug 10388, fix various default flags. --- Summary of changes: Modules/Platform/Windows-wcl386.cmake | 19 --- 1 files changed, 16 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-380-g28edb70
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 28edb70a9e22314da875a8fa104636461b71d8c6 (commit)
via e6ac0aacf6c3ce17141870e252fda77d994782d3 (commit)
from 02e3f42a6a4bc2b94befd35c908750c10f612d44 (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=28edb70a9e22314da875a8fa104636461b71d8c6
commit 28edb70a9e22314da875a8fa104636461b71d8c6
Merge: 02e3f42 e6ac0aa
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Sep 8 11:08:05 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 8 11:08:05 2010 -0400
Merge topic 'vs-project-groups'
e6ac0aa Add FOLDER target property, for IDEs (#3796)
diff --cc CMakeLists.txt
index b318a0c,dec502b..6e8b928
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -269,21 -288,11 +295,22 @@@ MACRO (CMAKE_BUILD_UTILITIES
${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2)
SET(BZIP2_LIBRARIES cmbzip2)
ADD_SUBDIRECTORY(Utilities/cmbzip2)
+ CMAKE_SET_TARGET_FOLDER(cmbzip2 Utilities/3rdParty)
ENDIF()
+
+ #-
+ # Build or use system libarchive for CMake and CTest.
IF(CMAKE_USE_SYSTEM_LIBARCHIVE)
-FIND_PACKAGE(libarchive)
-SET(CMAKE_TAR_LIBRARIES libarchive)
+IF(EXISTS ${CMAKE_ROOT}/Modules/FindLibArchive.cmake)
+ FIND_PACKAGE(LibArchive)
+ELSE()
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
+ INCLUDE(${CMake_SOURCE_DIR}/Modules/FindLibArchive.cmake)
+ENDIF()
+IF(NOT LibArchive_FOUND)
+ MESSAGE(FATAL_ERROR CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive
is not found!)
+ENDIF()
+SET(CMAKE_TAR_LIBRARIES ${LibArchive_LIBRARIES})
ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE)
SET(HAVE_LIBZ 1)
SET(HAVE_ZLIB_H 1)
diff --cc Tests/ExternalProject/CMakeLists.txt
index 587cf57,00db5d4..bf90a52
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@@ -81,8 -99,8 +101,9 @@@ if(can_build_tutorial_step5
URL ${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR -G
${CMAKE_GENERATOR} SOURCE_DIR
TEST_BEFORE_INSTALL 1
+LOG_INSTALL 1
)
+ set_property(TARGET ${proj} PROPERTY FOLDER Local)
ExternalProject_Get_Property(${proj} install_dir)
set(TutorialStep5_install_dir ${install_dir})
@@@ -91,8 -109,8 +112,9 @@@
URL ${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR -G
${CMAKE_GENERATOR} SOURCE_DIR
TEST_AFTER_INSTALL 1
+LOG_TEST 1
)
+ set_property(TARGET ${proj} PROPERTY FOLDER Local)
endif()
@@@ -108,8 -126,8 +130,9 @@@ ExternalProject_Add(${proj
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
-DTEST_LIST:STRING=A::B::C
INSTALL_COMMAND
+ LOG_CONFIGURE 1
)
+ set_property(TARGET ${proj} PROPERTY FOLDER Local/TAR)
set(proj TutorialStep1-LocalNoDirTAR)
ExternalProject_Add(${proj}
@@@ -137,8 -156,8 +161,9 @@@ ExternalProject_Add(${proj
URL_MD5 38c648e817339c356f6be00eeed79bd0
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR -G ${CMAKE_GENERATOR}
SOURCE_DIR
INSTALL_COMMAND
+ LOG_BUILD 1
)
+ set_property(TARGET ${proj} PROPERTY FOLDER Local/TGZ)
set(proj TutorialStep1-LocalNoDirTGZ)
ExternalProject_Add(${proj}
@@@ -362,8 -395,8 +401,9 @@@ if(do_svn_tests
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalSVNRepository
+LOG_DOWNLOAD 1
)
+ set_property(TARGET ${proj} PROPERTY FOLDER SVN)
endif()
@@@ -437,8 -474,8 +481,9 @@@ if(do_git_tests
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalGITRepository
+LOG_UPDATE 1
)
+ set_property(TARGET ${proj} PROPERTY FOLDER GIT)
endif()
---
Summary of changes:
CMakeLists.txt | 35 ++-
Modules/CTestTargets.cmake |2 +
Source/cmGlobalGenerator.cxx | 40 +++
Source/cmGlobalGenerator.h |3 +
Source/cmGlobalVisualStudio71Generator.cxx | 16 +
Source/cmGlobalVisualStudio7Generator.cxx | 99
Source/cmGlobalVisualStudio7Generator.h|4 +
Source/cmGlobalVisualStudio8Generator.cxx |7 ++
Source/cmGlobalVisualStudioGenerator.cxx | 15
Source/cmTarget.cxx| 11 +++-
Source/cmake.cxx |
[Cmake-commits] CMake branch, master, updated. v2.8.2-386-g7956760
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 795676062e4e6ddb4d471c42063b190b51507cea (commit) via 88fed668b1a35f6bd1c0ab2cd4bc6f62576b9121 (commit) from 048c905f05a293a4e748d47fa981b23049a03666 (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=795676062e4e6ddb4d471c42063b190b51507cea commit 795676062e4e6ddb4d471c42063b190b51507cea Merge: 048c905 88fed66 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:08:16 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:08:16 2010 -0400 Merge topic 'fix-9284' 88fed66 Make bundle items writable before fixup (#9284) --- Summary of changes: Modules/BundleUtilities.cmake |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-388-g18c71e3
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 18c71e3c79560f4577b7edb2910bfcac7cd0bfef (commit) via e93a4b4d3421ced7b8c852b76c0dcb427f798df8 (commit) from 795676062e4e6ddb4d471c42063b190b51507cea (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=18c71e3c79560f4577b7edb2910bfcac7cd0bfef commit 18c71e3c79560f4577b7edb2910bfcac7cd0bfef Merge: 7956760 e93a4b4 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:08:22 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:08:22 2010 -0400 Merge topic 'fix-10417' e93a4b4 Avoid adding self as prerequisite. (#10417) --- Summary of changes: Modules/BundleUtilities.cmake |2 +- Modules/GetPrerequisites.cmake | 25 +++-- 2 files changed, 24 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-394-g661d516
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 661d5166b06c30a7a490d28a8476989200744b87 (commit) via ede24f817124293de7d1d22353c0e6e81f250ebe (commit) via 3dbeeb77934d6dff85c71b001e07622c5ac6fe4c (commit) via f46712ebe7b3fe60a02f5fc5cf08cc861287c42b (commit) via 6cb14ebf160b156e842c644392377fd6460327c6 (commit) via 36c15a2f0bc0107074019901f3208891667a4546 (commit) from 18c71e3c79560f4577b7edb2910bfcac7cd0bfef (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=661d5166b06c30a7a490d28a8476989200744b87 commit 661d5166b06c30a7a490d28a8476989200744b87 Merge: 18c71e3 ede24f8 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 8 11:08:55 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 8 11:08:55 2010 -0400 Merge topic 'FindwxWidgets-fixes' ede24f8 ENH #8993: FindwxWidgets add support for wx-config custom options. 3dbeeb7 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW. f46712e BUG #11123: Generic include dir should come after config specific one. 6cb14eb STYLE: Clarified/Fixed documentation of UsewxWidgets. 36c15a2 BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension. --- Summary of changes: Modules/FindwxWidgets.cmake | 51 ++ Modules/UsewxWidgets.cmake | 18 ++ 2 files changed, 39 insertions(+), 30 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.2-400-gfcbdd31
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 fcbdd3129e7edec4b07f96662aa21371d671cb83 (commit)
from f444b9555f87ec187bff51d48cd29c22ab4a6121 (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=fcbdd3129e7edec4b07f96662aa21371d671cb83
commit fcbdd3129e7edec4b07f96662aa21371d671cb83
Author: David Cole david.c...@kitware.com
AuthorDate: Wed Sep 8 18:41:21 2010 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Wed Sep 8 18:50:03 2010 -0400
CMake: quote ':' in Windows NMake Makefiles (#9963)
diff --git a/Source/kwsys/System.c b/Source/kwsys/System.c
index 5d178bf..99d5c05 100644
--- a/Source/kwsys/System.c
+++ b/Source/kwsys/System.c
@@ -84,7 +84,8 @@ static int kwsysSystem_Shell__CharNeedsQuotesOnUnix(char c)
static int kwsysSystem_Shell__CharNeedsQuotesOnWindows(char c)
{
return ((c == '\'') || (c == '#') || (c == '') ||
- (c == '') || (c == '') || (c == '|') || (c == '^'));
+ (c == '') || (c == '') || (c == '|') ||
+ (c == '^') || (c == ':'));
}
/*--*/
---
Summary of changes:
Source/kwsys/System.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
