Re: [CMake] cpack -G NSIS
On 01/19/2012 07:52 PM, Eric Noulard wrote: Installing empty dir may fail. Try the attached zip and tell me if it fails for you. It works for me on Debian Wheezy 64. They were not empty dirs, and trying from another machine (arch 64 bits), with NSIS 2.46-3, and cmake 2.8.7-2 and kernel now 3.2.1-1 but I saw the same problem already on kernel 3.1 and also on the git version of CMake... This is the bactrace from running it within GDB: (not knowing much o f the internals I can't do much more unfortunately..) #0 0x76c4b935 in raise () from /lib/libc.so.6 #1 0x76c4cdab in abort () from /lib/libc.so.6 #2 0x7728c1ed in __gnu_cxx::__verbose_terminate_handler() () from /usr/lib/libstdc++.so.6 #3 0x7728a396 in ?? () from /usr/lib/libstdc++.so.6 #4 0x7728a3c3 in std::terminate() () from /usr/lib/libstdc++.so.6 #5 0x7728a4be in __cxa_throw () from /usr/lib/libstdc++.so.6 #6 0x772371f7 in std::__throw_logic_error(char const*) () from /usr/lib/libstdc++.so.6 #7 0x77275039 in char* std::string::_S_constructchar const*(char const*, char const*, std::allocatorchar const, std::forward_iterator_tag) () from /usr/lib/libstdc++.so.6 #8 0x77275113 in std::basic_stringchar, std::char_traitschar, std::allocatorchar ::basic_string(char const*, std::allocatorchar const) () from /usr/lib/libstdc++.so.6 #9 0x0048a9fe in cmCPackNSISGenerator::InitializeInternal() () #10 0x0047b7d4 in cmCPackGenerator::Initialize(char const*, cmMakefile*) () #11 0x004745b2 in main () -- 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] execute a script before and after configuration
I now see your point about changed env, sorry, I misunderstood you before.
Indeed module load/unload changes the env, but the changes are
excessive, involving include and linking paths for the currently
loaded compilers (and there can be a few...) and many other switches
involving paths to packages with explicit versions. It will be very
difficult - and very unsafe - to write - and maintain! - a solution
basically replicating the complexity that module load/unload hides.
I hope there is some way to run cmake as a shell process or to somehow
make some use of cross-compiling. Unfortunately, I do not know how,
and I do not know any other poor guy whose complex software platform
must build and run on both Windows and Cray to ask advice ;)
Regarding testing functionality, I think a better workaround than an
external project is simply two builds, one for the scheduler and one
for the local testing. It's still annoying and time consuming for a
big project, but I can live with that for the moment - unlike try_run
unfortunately. One workaround for it that I possibly see is to
delegate all try_run tests to python scripts. The problems here are
that python is not always available on all platforms, and that in some
cases it is not easy to do, e.g. when testing FPU accuracy.
Regards,
Dominik
On Sat, Jan 21, 2012 at 8:11 PM, Eric Noulard eric.noul...@gmail.com wrote:
2012/1/21 Dominik Szczerba domi...@itis.ethz.ch:
Running something from the command line does not mean it doesn't change the
environment.
Would you try
$ env env1.txt
$ module unload sysmodule_you_dont_want
$ env env2.txt
$ cmake -E compare_files env1.txt env2.txt
I'd be surprise if nothing changed but I may be wrong.
You are of course right, but this is not the scenario here. If you put
module un/load XXX into a bash script, and call it from command
line, it will only modify the env for this script/process. On the
return your original env will not be changed.
The very same scenario is happening with CMake.
To change it, you need
to source your script, but that is what seems to do nothing with
cmake.
Yes that's precisely the point CMake is not behaving like a shell at ALL
with respect to env var.
Re-read my other message.
When cmake executes a command (using e.g. execute_process)
it forks that is a NEW process which is a child of current cmake process
is created, then the command/executable is run within the child
(or replace the child http://en.wikipedia.org/wiki/Fork-exec)
then the child terminates and CMake continue with other
command with may be other child process.
So when you COMMAND module unload blah this only
affect the current child.
That's the same difference between sourcing a script and running it
with CMake you have no way to source a shell script because CMake
is not the shell.
From within CMake you source a cmake script (just include it)
but not a shell script (which seems to be the machinery behind the
'module' command).
What you can do however is to identify which environment change did the
module unload do and then do the same with cmake.
You may be able to monitor the change from cmake using a shell script
which does:
env file1
module unload
env file2
diff file1 file2
-- then process the diff ouput with some cmake script
en reproduce the environnement change using
set(ENV{EnvVarName} newValue)
--
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake + Ninja
Clifford Yapp cliffy...@gmail.com writes: On Sat, Jan 14, 2012 at 3:25 PM, Peter Collingbourne pe...@pcc.me.uk wrote: I managed to test these changes on a Mac and it fixed all but 7 test failures, so I rolled it into the ninja-generator-pr branch. In terms of applications I didn't have time to try building anything other than CMake itself and LLVM/Clang (both successfully), but please let me know if there are any other problems with BRL-CAD. Confirmed - working now on Mac building BRL-CAD - thanks! Does anyone know what changes are required to make the Ninja generator work on Windows? I know nothing about the CMake C++ base nor I see anything obvious on the source code of the Ninja generator but, maybe, with a starting point, something could be done with some hours I can devote to that task. I mailed Peter Collingbourne some weeks ago but received no response. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake + Ninja
On Sun, Jan 22, 2012 at 2:50 PM, Óscar Fuentes o...@wanadoo.es wrote: Clifford Yapp cliffy...@gmail.com writes: On Sat, Jan 14, 2012 at 3:25 PM, Peter Collingbourne pe...@pcc.me.uk wrote: I managed to test these changes on a Mac and it fixed all but 7 test failures, so I rolled it into the ninja-generator-pr branch. In terms of applications I didn't have time to try building anything other than CMake itself and LLVM/Clang (both successfully), but please let me know if there are any other problems with BRL-CAD. Confirmed - working now on Mac building BRL-CAD - thanks! Does anyone know what changes are required to make the Ninja generator work on Windows? I know nothing about the CMake C++ base nor I see anything obvious on the source code of the Ninja generator but, maybe, with a starting point, something could be done with some hours I can devote to that task. I mailed Peter Collingbourne some weeks ago but received no response. Mainly remove all shell related constructs like and redirection. Those topics has been discussed both on cmake/cmake-dev ML and ninja-build ML. Cheers, -- Nicolas Desprès -- 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] Top level directory with component install
2012/1/13 Eric Noulard eric.noul...@gmail.com: Hi everybody I just reviewed the patch from Daniel and it seems fine to me BUT including this would change the default cpack behavior for all Archive Generators (ZIP, TGZ, STGZ, TBZ2) when doing component install. The new behavior is more consistent with the non-component behavior but the two has been different since 2.8.4 so I'd like to know whether if people are relying on it or if we may change such default behavior which may be viewed as flawed... Please have a look at: http://public.kitware.com/Bug/view.php?id=12129 and comment here. I'd like to have feedback before pushing this to next. Currently it is in stage/AddTopLevelForComponent. No feedback for more than a week. No scream either. Just pushed to next. -- Erk Membre de l'April - « promouvoir et défendre le logiciel libre » - http://www.april.org -- 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] [New Module] Arduino CMake
Hi everyone, I'm not quite sure what the correct procedure is for becoming a CMake contributor, but from what I've read I should send a email here if I want to add a new module to cmake. For the past year I've been hosting my CMake modules on GitHub ( https://github.com/queezythegreat/arduino-cmake) and the project is mature enough that it could be included into CMake. The project is called Arduino CMake and it adds support for building Arduino projects. It is a alternative to the Arduino IDE, and works on Windows, Linux and Mac. The project is growing and getting more and more users, and I think it's would be a god fit to start bundling it with CMake. The project is well documented both from a developer standpoint as well as the user side. So what are the steps I should take in order to integrate my project into CMake? I also would like to contribute back some extensions to the CMake, such as Teamcity support for CTest. Any information would be greatly appreciated. Tomasz Bogdal -- 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] cpack -G NSIS
2012/1/22 Andrea Crotti andrea.crott...@gmail.com: On 01/19/2012 07:52 PM, Eric Noulard wrote: Installing empty dir may fail. Try the attached zip and tell me if it fails for you. It works for me on Debian Wheezy 64. They were not empty dirs, and trying from another machine (arch 64 bits), with NSIS 2.46-3, and cmake 2.8.7-2 and kernel now 3.2.1-1 but I saw the same problem already on kernel 3.1 and also on the git version of CMake... I don't think kernel version may explain the difference, I'm running 3.1 by the way and I cannot reproduce your bug. This is the bactrace from running it within GDB: (not knowing much o f the internals I can't do much more unfortunately..) Is this happening with my try_out example? I am really sorry but it looks like since I'm unable to reproduce your bug I cannot help you... I may suggest a last try. 1) If my try_out project is failing please zip the source AND build tree and send all this privately to me, I'll try to dig into the log in order to understand what happen. 2) If my try-out project succeed. Send me a zip (source AND build tree) of a failing project (the smaller the better) and I'll try again. Please DO NOT send inline example of what you did, but put all necessary files in a zip instead. Sometimes the devil is in the details. -- Erk Membre de l'April - « promouvoir et défendre le logiciel libre » - http://www.april.org -- 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] [New Module] Arduino CMake
Alfa Omega wrote: Hi everyone, I'm not quite sure what the correct procedure is for becoming a CMake contributor, but from what I've read I should send a email here if I want to add a new module to cmake. Hi Tomasz, This page should have all you need to know: http://www.itk.org/Wiki/CMake:Module_Maintainers It's probably more appropriate to email the developers list: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers Thanks, Steve. For the past year I've been hosting my CMake modules on GitHub ( https://github.com/queezythegreat/arduino-cmake) and the project is mature enough that it could be included into CMake. The project is called Arduino CMake and it adds support for building Arduino projects. It is a alternative to the Arduino IDE, and works on Windows, Linux and Mac. The project is growing and getting more and more users, and I think it's would be a god fit to start bundling it with CMake. The project is well documented both from a developer standpoint as well as the user side. So what are the steps I should take in order to integrate my project into CMake? I also would like to contribute back some extensions to the CMake, such as Teamcity support for CTest. Any information would be greatly appreciated. Tomasz Bogdal -- 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] cpack -G NSIS
So yes this was with your try-out example, actually I can try to dig a little bit myself, the problem is that with gdb I need to have the debug symbols, thus recompiling in debug mode. But nowhere in the Readme or around the code I found a way to do it (it would be very nice to add maybe somewhere).. I found only this in the Makefile which might be useful, but I'm sure there is a smarter way to just install with the debug symbols.. -DCMAKE_INSTALL_DO_STRIP=1 Thanks a lot, Andrea -- 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] [New Module] Arduino CMake
Thanks for the quick response. I'll repost my question on the developer mailing list. I probably need someones approval to get Git access (for step 5)... Tomasz B. On Sun, Jan 22, 2012 at 10:20 PM, Stephen Kelly steve...@gmail.com wrote: Alfa Omega wrote: Hi everyone, I'm not quite sure what the correct procedure is for becoming a CMake contributor, but from what I've read I should send a email here if I want to add a new module to cmake. Hi Tomasz, This page should have all you need to know: http://www.itk.org/Wiki/CMake:Module_Maintainers It's probably more appropriate to email the developers list: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers Thanks, Steve. For the past year I've been hosting my CMake modules on GitHub ( https://github.com/queezythegreat/arduino-cmake) and the project is mature enough that it could be included into CMake. The project is called Arduino CMake and it adds support for building Arduino projects. It is a alternative to the Arduino IDE, and works on Windows, Linux and Mac. The project is growing and getting more and more users, and I think it's would be a god fit to start bundling it with CMake. The project is well documented both from a developer standpoint as well as the user side. So what are the steps I should take in order to integrate my project into CMake? I also would like to contribute back some extensions to the CMake, such as Teamcity support for CTest. Any information would be greatly appreciated. Tomasz Bogdal -- 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 -- --=[QTZ]=-- QueezyTheGreat -- 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] cpack -G NSIS
2012/1/22 Andrea Crotti andrea.crott...@gmail.com: So yes this was with your try-out example, actually I can try to dig a little bit myself, the problem is that with gdb I need to have the debug symbols, thus recompiling in debug mode. But nowhere in the Readme or around the code I found a way to do it (it would be very nice to add maybe somewhere).. This may be found here: http://www.cmake.org/Wiki/CMake_Useful_Variables#Compilers_and_Tools The ML archive contains an answer as well: http://www.cmake.org/pipermail/cmake/2009-April/028730.html KDE dev has some info too: http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes May be it would be interesting to add a FAQ entry in order to make it easier to find. However, compiling a CMake enabled project (thus including CMake itself when you do not 'bootstrap') in debug mode is always done the same way: set(CMAKE_BUILD_TYPE Debug) (or set the same var on the cmake command line). You may also try this script: http://public.kitware.com/Bug/file_download.php?file_id=4161type=bug which enables you to download and compile a debug version of CMake automatically if you already have a previous cmake version installed. -- Erk Membre de l'April - « promouvoir et défendre le logiciel libre » - http://www.april.org -- 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] typo in cmake_tutorial
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 In http://www.cmake.org/cmake/help/cmake_tutorial.html two thirds down, in Step 5: TutorialConfig.h looks like: should read TutorialConfig.h.in looks like: IMHO. Cheers, Johannes -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk8cieIACgkQ7X1+MfqVcr1GqgCdHfoBYNeJqsrPwTxwuGUrX5nZ 7zIAn3mfdObb5rM8fp71evbr5vdv0pEd =aHAP -END PGP SIGNATURE- -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.7-2187-gb98f87a
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 b98f87ace9dc047af46e9efa3292302babc0afb0 (commit)
via 9ee14d178b4336e9c69822044f7fb2ea725c33fd (commit)
via 3be1282fd31e7f663b4fdd6a271781cceccbdbda (commit)
from db18163a1dc6151d74027f3be3b12dd58971a40b (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=b98f87ace9dc047af46e9efa3292302babc0afb0
commit b98f87ace9dc047af46e9efa3292302babc0afb0
Merge: db18163 9ee14d1
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Jan 22 06:52:42 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Jan 22 06:52:42 2012 -0500
Merge topic 'improve-findjasper' into next
9ee14d1 FindJasper: find debug libraries
3be1282 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ee14d178b4336e9c69822044f7fb2ea725c33fd
commit 9ee14d178b4336e9c69822044f7fb2ea725c33fd
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Jan 22 11:15:24 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Sun Jan 22 12:51:54 2012 +0100
FindJasper: find debug libraries
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index bae4c05..1933875 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -19,19 +19,28 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-FIND_PACKAGE(JPEG)
-
FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
-FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
+IF (NOT JASPER_LIBRARIES)
+FIND_PACKAGE(JPEG)
+
+FIND_LIBRARY(JASPER_LIBRARY_RELEASE NAMES jasper libjasper)
+FIND_LIBRARY(JASPER_LIBRARY_DEBUG NAMES japserd jasper libjasper)
+
+IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+SET(JASPER_LIBRARIES optimized ${JASPER_LIBRARY_RELEASE} debug
${JASPER_LIBRARY_DEBUG})
+ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+SET(JASPER_LIBRARIES ${JASPER_LIBRARY_RELEASE})
+ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ENDIF (NOT JASPER_LIBRARIES)
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARY
JASPER_INCLUDE_DIR JPEG_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES
JASPER_INCLUDE_DIR JPEG_LIBRARIES)
IF (JASPER_FOUND)
- SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
+ SET(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} )
ENDIF (JASPER_FOUND)
-MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY_RELEASE
JASPER_LIBRARY_DEBUG)
---
Summary of changes:
Modules/FindJasper.cmake | 21 +++--
Source/kwsys/kwsysDateStamp.cmake |2 +-
2 files changed, 16 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2189-g6de2163
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 6de2163c895d1ee84e4c49e6895071567d18a4d0 (commit)
via 0f7ae05a423716078b64ea341f1e339162ee9f6d (commit)
from b98f87ace9dc047af46e9efa3292302babc0afb0 (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=6de2163c895d1ee84e4c49e6895071567d18a4d0
commit 6de2163c895d1ee84e4c49e6895071567d18a4d0
Merge: b98f87a 0f7ae05
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Jan 22 07:10:12 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Jan 22 07:10:12 2012 -0500
Merge topic 'improve-findjasper' into next
0f7ae05 FindJasper: support version number
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f7ae05a423716078b64ea341f1e339162ee9f6d
commit 0f7ae05a423716078b64ea341f1e339162ee9f6d
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Jan 22 13:09:33 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Sun Jan 22 13:09:33 2012 +0100
FindJasper: support version number
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index 1933875..0de5af5 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -3,11 +3,13 @@
#
# JASPER_FOUND - system has Jasper
# JASPER_INCLUDE_DIR - the Jasper include directory
-# JASPER_LIBRARIES - The libraries needed to use Jasper
+# JASPER_LIBRARIES - the libraries needed to use Jasper
+# JASPER_VERSION_STRING - the version of Jasper found (since CMake 2.8.8)
#=
# Copyright 2006-2009 Kitware, Inc.
# Copyright 2006 Alexander Neundorf neund...@kde.org
+# Copyright 2012 Rolf Eike Beer e...@sf-mail.de
#
# Distributed under the OSI-approved BSD License (the License);
# see accompanying file Copyright.txt for details.
@@ -34,10 +36,18 @@ IF (NOT JASPER_LIBRARIES)
ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
ENDIF (NOT JASPER_LIBRARIES)
+IF (JASPER_INCLUDE_DIR AND EXISTS ${JASPER_INCLUDE_DIR}/jasper/jas_config.h)
+FILE(STRINGS ${JASPER_INCLUDE_DIR}/jasper/jas_config.h
jasper_version_str REGEX ^#define[\t ]+JAS_VERSION[\t ]+\.*\.*)
+
+STRING(REGEX REPLACE ^#define[\t ]+JAS_VERSION[\t ]+\([^\]+)\.* \\1
JASPER_VERSION_STRING ${jasper_version_str})
+ENDIF (JASPER_INCLUDE_DIR AND EXISTS
${JASPER_INCLUDE_DIR}/jasper/jas_config.h)
+
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES
JASPER_INCLUDE_DIR JPEG_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper
+ REQUIRED_VARS JASPER_LIBRARIES
JASPER_INCLUDE_DIR JPEG_LIBRARIES
+ VERSION_VAR JASPER_VERSION_STRING)
IF (JASPER_FOUND)
SET(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} )
---
Summary of changes:
Modules/FindJasper.cmake | 14 --
1 files changed, 12 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2191-g68e7a89
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 68e7a89ea1c44f53e146e9e9d6e06d6702b0615a (commit)
via 3cab24a9740ad1d35e548629f6dda12e166ef49e (commit)
from 6de2163c895d1ee84e4c49e6895071567d18a4d0 (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=68e7a89ea1c44f53e146e9e9d6e06d6702b0615a
commit 68e7a89ea1c44f53e146e9e9d6e06d6702b0615a
Merge: 6de2163 3cab24a
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Sun Jan 22 13:32:08 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Jan 22 13:32:08 2012 -0500
Merge topic 'AddTopLevelForComponent' into next
3cab24a CPack Add top level directory in component install for Archive
Generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cab24a9740ad1d35e548629f6dda12e166ef49e
commit 3cab24a9740ad1d35e548629f6dda12e166ef49e
Author: Daniel Nelson tor...@connect2.com
AuthorDate: Fri Jan 13 22:01:53 2012 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Fri Jan 13 22:01:53 2012 +0100
CPack Add top level directory in component install for Archive Generators
This patch fixes bug #0012129
Signed-off-by: Eric NOULARD eric.noul...@gmail.com
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 0ce5b01..12d1796 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -57,13 +57,20 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
std::string dir = cmSystemTools::GetCurrentWorkingDirectory();
// Change to local toplevel
cmSystemTools::ChangeDirectory(localToplevel.c_str());
+ std::string filePrefix;
+ if (this-IsOn(CPACK_INCLUDE_TOPLEVEL_DIRECTORY))
+{
+filePrefix = this-GetOption(CPACK_PACKAGE_FILE_NAME);
+filePrefix += /;
+}
std::vectorstd::string::const_iterator fileIt;
for (fileIt = component-Files.begin(); fileIt != component-Files.end();
++fileIt )
{
+std::string rp = filePrefix + *fileIt;
cmCPackLogger(cmCPackLog::LOG_DEBUG,Adding file:
- (*fileIt) std::endl);
-archive.Add(*fileIt);
+ rp std::endl);
+archive.Add(rp);
if (!archive)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, ERROR while packaging files:
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 083279f..01ed4df 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -691,6 +691,11 @@ int
cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// one install directory for each component.
tempInstallDirectory +=
GetComponentInstallDirNameSuffix(installComponent);
+ if (this-IsOn(CPACK_INCLUDE_TOPLEVEL_DIRECTORY))
+{
+tempInstallDirectory += /;
+tempInstallDirectory += this-GetOption(CPACK_PACKAGE_FILE_NAME);
+}
}
if (!setDestDir)
---
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.cxx | 11 +--
Source/CPack/cmCPackGenerator.cxx|5 +
2 files changed, 14 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-145-g86c9604
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 86c9604f98b2271401cf7a53c251be51af15278c (commit) from 3be1282fd31e7f663b4fdd6a271781cceccbdbda (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=86c9604f98b2271401cf7a53c251be51af15278c commit 86c9604f98b2271401cf7a53c251be51af15278c Author: KWSys Robot kwro...@kitware.com AuthorDate: Mon Jan 23 00:05:11 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Mon Jan 23 00:05:11 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index d378136..0ce4f2c 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 01) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 22) +SET(KWSYS_DATE_STAMP_DAY 23) --- 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
