[cmake-developers] Fix for #0012431: CPackDeb.cmake creates debian directory only, DEBIAN sometimes needed - dpkg-shlibdeps bails out upon a $ORIGIN RPATH
I have the same issue as http://public.kitware.com/Bug/view.php?id=12431 The problem is that when making a .deb using cpack, and dpkg-shlibdeps has been enabled, and the executable is using rpath with $ORIGIN, dpkg-shlibdeps requires DEBIAN directory in order to relativize $ORIGIN. The solution is to create a DEBIAN directory side-by-side with the debian directory, as mentioned in the bug. I attach a patch, it would be great if this could be included in CMake. 0001-Create-DEBIAN-directory-for-dpkg-shlibdeps.patch Description: Binary data -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Fix for #0012431: CPackDeb.cmake creates debian directory only, DEBIAN sometimes needed - dpkg-shlibdeps bails out upon a $ORIGIN RPATH
On 05/07/2013 10:04 AM, John Knottenbelt wrote: I have the same issue as http://public.kitware.com/Bug/view.php?id=12431 The problem is that when making a .deb using cpack, and dpkg-shlibdeps has been enabled, and the executable is using rpath with $ORIGIN, dpkg-shlibdeps requires DEBIAN directory in order to relativize $ORIGIN. The solution is to create a DEBIAN directory side-by-side with the debian directory, as mentioned in the bug. I attach a patch, it would be great if this could be included in CMake. Thanks. I've cross-linked this thread in the issue: http://www.cmake.org/Bug/view.php?id=12431#c33004 Eric, can you review this please? Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [CMake] custom NSIS installer
On Tue, May 7, 2013 at 4:22 AM, David Golub golu...@gmail.com wrote: Just put your NSIS.template.in in the root of your source tree along with CMakeLists.txt. CMake will detect your file and use it instead of the one in the CMake installation. ** ** David Golub I would like to thank you all for the valuable information. Thanks, Lloyd -- 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] Problems with ctest output using clang compiler on Mac
Hi,
Just to inform CMake users on Mac OS X that problem is solved by
using CTEST_USE_LAUNCHERS option.
As a reminder, problem is that some warnings generated by
different clang processes during parallel compilation get mixed
together, become unreadable, and are therefore processed as errors
by ctest.
With 'CTEST_USE_LAUNCHERS' option, stdout and stderr outputs of
parallel clang processes are handled differently and do not get
mixed together anymore.
More details about this option are available in this page at item
2. : http://www.kitware.fr/blog/home/post/11
To activate CTEST_USE_LAUNCHERS in you ctest script, following
lines are needed :
set(CTEST_USE_LAUNCHERS 1)
...
ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}"
OPTIONS "-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}"
... )
A last point : a side effect of this option I have observed
is that warnings and errors are counted differently. Number of
compilation units yielding errors and warnings are counted, and
not individual errors and warning messages.
If someone knowns a method to use CTEST_USE_LAUNCHERS option with
individual counting of error and warning messages, I am
interested.
Hope this helps,
Kind regards
Ananda
On 10/01/2013 15:24, Ananda Tallur wrote:
Hi,
We have the same problem here with ctest and clang on Mac OS X.
Versions used are :
- clang 4.2, from XCode 4.6DP4 on Mac OS X 10.7
- cmake 2.8.10.2
In our ctest script, compilation is launched with 4 jobs (make -j4).
In our dashboard (and same thing when directly looking at the text output of the ctest process), we notice that some compilations outputs get mixed.
In this case we can see the beginning of one compilation process output starting in the middle of a previous compilation output.
This leads to some mixed outputs of two different compilation processes, that cannot be properly interpreted by ctest as warning, and are therefore displayed as errors.
At the end of this mail, an example of the kind of mixes we have.
Is anybody facing the same problem and is there a workaround available ?
Kind regards
Ananda
-
12:
In file included from O/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/functional/hash/hash.hppIn file included from /usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/date_time/gregorian/gregorian.hppO:S15:
T:_I34/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/functional/hash/detail/hash_float.hpp:T71E:R:
25In file included from AT:O Rwarning: _/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/date_time/gregorian/parsers.hppFcAa:s13tC :
In file included from AD/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/date_time/date_parsing.hpp:fEr_oP15:
mL US'In file included from 'c
har/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/tokenizer.hpp:20 *:
In file included from ' /usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/token_iterator.hpp:24t return tmp += n; \o ':
s ^t/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/token_functions.hpp
:312:d:33: :swarning: uiznuse_e/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/gil/image_view.hpp:d125 t: p68a:* 'note: ir(n aiansmetaktae n'tuianrt iso'n igonefd lofnugb' * [')n- Wicutninocnr etaesmpeulass rteed-peaq rsameupiteercri]al
eidz aatliiognn m'ebnoto sftr:o:mo p1e rtaot o8static void assign(Iterator b, Iterator e, Token t) { }
^
r [+-Wbcoa/usr/local/mkt-dev/install/boost-1.52.0_patch_range_search_n-macosx10.7-x86_64-gnu++11_libc++-20121226/build-x86_64/include/boost/token_functions.hpposstt:-:a312l:i:gg45inl]
[ 58%] Building CXX object libProcessing/tests/CMakeFiles/jitterestimationfilter_test.dir/jitterestimationfilter_test.cpp.o
:::iterator warning: _frunom_2dusbedoos parat:me:gteilr ::'eme' mo[r-Wuy_basnued_se2d_lod-capatorbrametooerst]
::gil:seed = *(std::size_t*) ptr;
:m^~
emory_bstatic void assign(Iterator b,
Re: [CMake] Problem with CMAKE_AUTOMOC files not being regenerated or cleaned
I won't bother just yet then. Let me know if I can be of any help in testing your fix. BTW, is your fix likely to make it into the pending 2.8.11 release ? -- Glenn On 5 May 2013 19:33, Alexander Neundorf a.neundorf-w...@gmx.net wrote: On Sunday 05 May 2013, Glenn Coombs wrote: Alex, Would you like me to file a bug report on this ? you can do so, but I'm working on a fix already anyway. Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] custom NSIS installer
On 5/7/2013 8:20 AM, Lloyd wrote:
On Tue, May 7, 2013 at 4:22 AM, David Golub golu...@gmail.com
mailto:golu...@gmail.com wrote:
Just put your NSIS.template.in http://NSIS.template.in in the root
of your source tree along with CMakeLists.txt. CMake will detect
your file and use it instead of the one in the CMake installation.
__ __
David Golub
I would like to thank you all for the valuable information.
put the file in a dir called CMake in your source tree, then do this:
(your_project is the name you gave your project in the project command)
set(CMAKE_MODULE_PATH ${your_project_SOURCE_DIR}/CMake)
Thanks,
Lloyd
--
Bill Hoffman
Kitware, Inc.
28 Corporate Drive
Clifton Park, NY 12065
bill.hoff...@kitware.com
http://www.kitware.com
518 881-4905 (Direct)
518 371-3971 x105
Fax (518) 371-4573
--
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] Problem with CMAKE_AUTOMOC files not being regenerated or cleaned
On Tuesday 07 May 2013, Glenn Coombs wrote: I won't bother just yet then. Let me know if I can be of any help in testing your fix. BTW, is your fix likely to make it into the pending 2.8.11 release ? Don't know, probably it's too late. Alex -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Robert, add me to your LinkedIn network?
LinkedIn Gustavo Gutierrez-Sabogal requested to add you as a connection on LinkedIn: -- Robert, I'd like to add you to my professional network on LinkedIn. - Gustavo Accept invitation from Gustavo Gutierrez-Sabogal http://www.linkedin.com/e/-nf7vxk-hgfmdu4t-1/ucd2OXGR4jr_IQjfrDqica5hdW/blk/I384418703_45/3wOtCVFbmdxnSVFbm8JrnpKqlZJrmZzbmNJpjRQnOpBtn9QfmhBt71BoSd1p65Lr6lOfPkQnPcMdPwNd3gUcQALkSAMqj9BgjkLd3ARd3AUd3sMcP4LrCBxbOYWrSlI/eml-comm_invm-b-in_ac-inv28/?hs=falsetok=1z81p9teECV5I1 View profile of Gustavo Gutierrez-Sabogal http://www.linkedin.com/e/-nf7vxk-hgfmdu4t-1/rso/27644595/yFU2/name/45250414_I384418703_45/?hs=falsetok=2J0LFtNQsCV5I1 -- You are receiving Invitation emails. This email was intended for Robert Matusewicz. Learn why this is included: http://www.linkedin.com/e/-nf7vxk-hgfmdu4t-1/plh/http%3A%2F%2Fhelp%2Elinkedin%2Ecom%2Fapp%2Fanswers%2Fdetail%2Fa_id%2F4788/-GXI/?hs=falsetok=0zJQFNRM8CV5I1 (c) 2012, LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA 94043, USA. -- 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] MACOSX_PACKAGE_LOCATION Not Working?
Hi,
I am trying to copy assets (textures) into an application bundle in my
project's CMake file. The solution that has brought me the closest was the
following:
// ${ASSETS_DIR} points to a directory in my project that contains the textures
file( GLOB Textures ${ASSETS_DIR}/*.dds )
file( GLOB Sources *.cpp *.h )
set_property( SOURCE ${Textures} PROPERTY MACOSX_PACKAGE_LOCATION Assets )
add_executable( MyProject MACOSX_BUNDLE ${Sources} ${Textures} )
set_target_properties( MyProject PROPERTIES RESOURCE ${Textures} )
This gets me as far as having all my textures in the application bundle, but it
seems to ignore the MACOSX_PACKAGE_LOCATION because the textures end up in the
same (root) directory as the executable and not the in specified Assets
directory.
Am I missing something or doing something wrong? Is there a way to have CMake
copy my textures into the application bundle in a specific directory?
Thanks,
--
Marek Vojtko
mail: marek.voj...@firaxis.com
phone: (+1) 410-229-2519
--
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.10.2-2878-g2241686
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 224168673684f41a472a7d5de6e721b9154650ce (commit)
via b7593bf3f5a656c6c2651d31c6858ad0e35f01d9 (commit)
via d0cdc687353cbba0ab844a360a23c71945c8370b (commit)
from 459dce5159f17d1929607b71a4ecf6db543ea8a5 (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=224168673684f41a472a7d5de6e721b9154650ce
commit 224168673684f41a472a7d5de6e721b9154650ce
Merge: 459dce5 b7593bf
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 7 08:39:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 7 08:39:25 2013 -0400
Merge topic 'update-kwsys' into next
b7593bf Merge branch 'upstream-kwsys' into update-kwsys
d0cdc68 KWSys 2013-05-06 (f4928d44)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7593bf3f5a656c6c2651d31c6858ad0e35f01d9
commit b7593bf3f5a656c6c2651d31c6858ad0e35f01d9
Merge: 0c04428 d0cdc68
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 7 08:38:10 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 7 08:38:10 2013 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0cdc687353cbba0ab844a360a23c71945c8370b
commit d0cdc687353cbba0ab844a360a23c71945c8370b
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Mon May 6 10:29:55 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 7 08:38:05 2013 -0400
KWSys 2013-05-06 (f4928d44)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ f4928d44 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 709fb5c1..f4928d44
Andreas Mohr (1):
f4928d44 Fix spelling and typos in comments and method documentation
Change-Id: I64109c176370a9f10a22da21bc81bd9306a80431
diff --git a/CommandLineArguments.hxx.in b/CommandLineArguments.hxx.in
index 68e9600..cbf6ee3 100644
--- a/CommandLineArguments.hxx.in
+++ b/CommandLineArguments.hxx.in
@@ -44,7 +44,7 @@ struct CommandLineArgumentsCallbackStructure;
*
* For the variable interface you associate variable with each argument. When
* the argument is specified, the variable is set to the specified value casted
- * to the apropriate type. For boolean (NO_ARGUMENT), the value is 1.
+ * to the appropriate type. For boolean (NO_ARGUMENT), the value is 1.
*
* Both interfaces can be used at the same time.
*
@@ -99,7 +99,7 @@ public:
STRING_TYPE, // The variable is string (char*)
STL_STRING_TYPE, // The variable is string (char*)
VECTOR_INT_TYPE, // The variable is integer (int)
-VECTOR_BOOL_TYPE,// The vairable is boolean (bool)
+VECTOR_BOOL_TYPE,// The variable is boolean (bool)
VECTOR_DOUBLE_TYPE, // The variable is float (double)
VECTOR_STRING_TYPE, // The variable is string (char*)
VECTOR_STL_STRING_TYPE, // The variable is string (char*)
@@ -128,7 +128,7 @@ public:
void ProcessArgument(const char* arg);
/**
- * This method will parse arguments and call apropriate methods.
+ * This method will parse arguments and call appropriate methods.
*/
int Parse();
@@ -144,7 +144,7 @@ public:
/**
* Add handler for argument which is going to set the variable to the
* specified value. If the argument is specified, the option is casted to the
- * apropriate type.
+ * appropriate type.
*/
void AddArgument(const char* argument, ArgumentTypeEnum type,
bool* variable, const char* help);
@@ -160,7 +160,7 @@ public:
/**
* Add handler for argument which is going to set the variable to the
* specified value. If the argument is specified, the option is casted to the
- * apropriate type. This will handle the multi argument values.
+ * appropriate type. This will handle the multi argument values.
*/
void AddArgument(const char* argument, ArgumentTypeEnum type,
kwsys_stl::vectorbool* variable, const char* help);
diff --git a/SharedForward.h.in b/SharedForward.h.in
index 8521099..8bbc74a 100644
--- a/SharedForward.h.in
+++ b/SharedForward.h.in
@@ -772,7 +772,7 @@ static int kwsys_shared_forward_get_settings(const char*
self_path,
const char** dir;
for(dir = search_path; *dir; ++dir)
{
-/* Add seperator between path components. */
+/* Add separator between path components. */
if(dir != search_path)
{
strcat(ldpath, kwsys_shared_forward_path_sep);
diff --git a/SystemInformation.hxx.in
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2880-gb130d72
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 b130d725ff6986e2cbf5ecb2aacc292c55395d60 (commit)
via e807131513efe997a85cdb61d6757e519861d066 (commit)
from 224168673684f41a472a7d5de6e721b9154650ce (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=b130d725ff6986e2cbf5ecb2aacc292c55395d60
commit b130d725ff6986e2cbf5ecb2aacc292c55395d60
Merge: 2241686 e807131
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue May 7 08:40:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 7 08:40:25 2013 -0400
Merge topic 'fix-per-config-tll-include-dirs' into next
e807131 Make this library non-SHARED.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e807131513efe997a85cdb61d6757e519861d066
commit e807131513efe997a85cdb61d6757e519861d066
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue May 7 14:39:43 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue May 7 14:39:43 2013 +0200
Make this library non-SHARED.
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 2930330..b003a1b 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -115,7 +115,7 @@ endif()
set(_exe_test $STREQUAL:$TARGET_PROPERTY:TYPE,EXECUTABLE)
target_link_libraries(targetC $$AND:${_exe_test},${_exe_test}:depG)
-add_library(libConsumer SHARED empty.cpp)
+add_library(libConsumer empty.cpp)
# This line causes $$CONFIG:Debug:depA to be used when
# determining the include directories for libConsumer based on the
# interface properties of its LINK_LIBRARIES. Because the above expression
---
Summary of changes:
.../target_link_libraries/CMakeLists.txt |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, release, updated. v2.8.10.2-1030-g6162e0f
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, release has been updated via 6162e0ff2d20d70cb2f7ef6714e05ca65aed3123 (commit) via b882ef7565528c4009eca45bdc428c5c89c3dff9 (commit) via ff298fff79b2dd9773f027573c7f862a18e0bc36 (commit) via 6c6bfe1509e8593539d551787029fcb360127d1b (commit) via 0483bf8062822b56158740e5cbe897b728d9809c (commit) via dea1df4e5e05b8ba3de5099741a50cdea384f88e (commit) via 26dba6a1622422d3742254aa2ecab97f9a58cb2b (commit) via b8259c3d69258b884383559b74d37486b6a06ca2 (commit) via b85f691d78b4f37f05304e95e853b6c01f01bd25 (commit) via 4cb77c4a0eef23f25137c3e7162f4847d2634f8d (commit) via 21bdeadf00eb66d1e6c14b99ef0b67432d6fe31b (commit) via 41839d6fb690225c5779b02d113d0d38ee77d9ba (commit) via d94eae435654229cef686ac4f7ab92098da2ce99 (commit) via e9e088a4df62f33cacffe7bfd1840ade3ac52db8 (commit) via 2618e0257e5c6fdca4137b371153fbf1152cbef5 (commit) via 2ba65cc9d904b634120b1b56eabd046aad33ac75 (commit) via c80594ba1274c3dc44c3f2efd70bd5c3d9066bf5 (commit) via 77df4ef5ac3b8fcae52d8f964756ec4fdf35e5c5 (commit) via 82f5936a8bc2a16c6d2c5e003a38cbc150cf349a (commit) via c8b34729d90366a7dfee7b0d4a3df1ebfd7cdeab (commit) via 78185f598c152b1dbce632e953874ce8132c5fe9 (commit) via 90bd16419343ada9f026ce8387fafff9c3546a10 (commit) via 2baf851c34357cbb752bb91b99b835d3847b23a1 (commit) via e55b8ce4a4f5d6a935fe82d600637c79e64e8cbd (commit) via d37fe5bc5b328fae6b03af033ba69651f045df80 (commit) via 50e96802d2ad81f69d72dc87de80eee74d7a8dc9 (commit) via e6c3595fde100b62f021ddb253b81fe3ecc9328b (commit) from 573f39cb2ad6dcf70f85514132a504e9c2da1e0b (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=6162e0ff2d20d70cb2f7ef6714e05ca65aed3123 commit 6162e0ff2d20d70cb2f7ef6714e05ca65aed3123 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue May 7 11:56:31 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Tue May 7 11:56:31 2013 -0400 CMake 2.8.11-rc4 diff --git a/ChangeLog.manual b/ChangeLog.manual index 2a44133..970d67c 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,13 @@ +Changes in CMake 2.8.11-rc4 (since 2.8.11-rc3) +-- +Brad King (1): + target_link_libraries: Update usage requirements documentation + +Stephen Kelly (3): + Centralize maintenance of usage requirement include directories + Fix include dir propagation from conditionally linked targets + Memoize usage requirement include directories in a config-specific map + Changes in CMake 2.8.11-rc3 (since 2.8.11-rc2) -- Brad King (1): diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ce99a2c..9ca7add 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -3,4 +3,4 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) set(CMake_VERSION_TWEAK 0) -set(CMake_VERSION_RC 3) +set(CMake_VERSION_RC 4) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b882ef7565528c4009eca45bdc428c5c89c3dff9 commit b882ef7565528c4009eca45bdc428c5c89c3dff9 Merge: ff298ff 573f39c Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue May 7 11:33:14 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Tue May 7 11:33:14 2013 -0400 Merge branch 'release' --- Summary of changes: ChangeLog.manual| 10 + Source/CMakeVersion.cmake |2 +- Source/cmTarget.cxx | 68 -- Source/cmTarget.h |1 - Source/cmTargetLinkLibrariesCommand.cxx |8 Source/cmTargetLinkLibrariesCommand.h | 19 + 6 files changed, 76 insertions(+), 32 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.10.2-2900-gbed399f
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 bed399f33e43a81e3b19c707de89cfbd43736d71 (commit)
via 3e36874265e08b22cb4c33f70bdea803997eabd9 (commit)
via 4b505e4741a59d8d2078ab6fa8c8f75b7ca4c7e4 (commit)
via 641593aa435975c0a0afeff185b1e4c654b5959c (commit)
via dc91f37757db1e2822bf8f355386a9b1995e41cf (commit)
via 6b418eddbd8510c414824c2ed3bda27a0921d81f (commit)
via ed84fdd554efafa99b13d33dca2b1ab31835d15f (commit)
via 3bc666d48aef21842f4057dc77bce29586eecff2 (commit)
via ff298fff79b2dd9773f027573c7f862a18e0bc36 (commit)
from 558a76c75bed421972d4d49810940cb6c4122c3e (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=bed399f33e43a81e3b19c707de89cfbd43736d71
commit bed399f33e43a81e3b19c707de89cfbd43736d71
Merge: 558a76c 3e36874
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Tue May 7 16:37:26 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 7 16:37:26 2013 -0400
Merge topic 'MemChecker-improvements' into next
3e36874 tests: add test for non-existent Valgrind suppression file
4b505e4 CTest: drop suppression for gcc 2.9.6 errors from default Valgrind
flags
641593a Tests: verify that memory checker output files are always present
dc91f37 Tests: remove code duplication in CTestTestMemCheck tests
6b418ed CTest: remove unreachable code and CTestTestMemcheckUnknown test
ed84fdd CTest: use an output file for Valgrind (#14110)
3bc666d Tests: create output files for all memory checkers
ff298ff CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e36874265e08b22cb4c33f70bdea803997eabd9
commit 3e36874265e08b22cb4c33f70bdea803997eabd9
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Tue May 7 00:03:16 2013 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Tue May 7 22:23:12 2013 +0200
tests: add test for non-existent Valgrind suppression file
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/CMakeLists.txt
index 4663fe8..59400ab 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -96,6 +96,9 @@ set(CTEST_EXTRA_CONFIG set(CTEST_CUSTOM_MEMCHECK_IGNORE
RunCMakeAgain)\n)
set(CMAKELISTS_EXTRA_CODE add_test(NAME RunCMakeAgain COMMAND
\\${CMAKE_COMMAND}\ --version))
gen_mc_test(DummyValgrindIgnoreMemcheck \${PSEUDO_VALGRIND})
+set(CTEST_EXTRA_CONFIG set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE
\\${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\))
+gen_mc_test(DummyValgrindInvalidSupFile \${PSEUDO_VALGRIND})
+
unset(CTEST_EXTRA_CONFIG)
unset(CMAKELISTS_EXTRA_CODE)
gen_mc_test(NotExist \${CTEST_BINARY_DIRECTORY}/no-memcheck-exe)
@@ -134,3 +137,6 @@
set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
PASS_REGULAR_EXPRESSION \n1/1 MemCheck #1: RunCMake \\.+ Passed
+[0-0]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error
parsing XML in stream at line 1: no element found\n)
+
+set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
+PASS_REGULAR_EXPRESSION \nCannot find memory checker suppression file:
${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b505e4741a59d8d2078ab6fa8c8f75b7ca4c7e4
commit 4b505e4741a59d8d2078ab6fa8c8f75b7ca4c7e4
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Mon May 6 22:04:30 2013 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Tue May 7 22:23:12 2013 +0200
CTest: drop suppression for gcc 2.9.6 errors from default Valgrind flags
The --workaround-gcc296-bugs has been part of the default Valgrind flags
since
Valgrind support was added in commit
5b232ded151fc22144978b74cdaf7031d466e527
(ENH: Add initial memory check support which works for Valgrind,
2003-12-15).
The Valgrind manpage says that this option should be avoided if not really
needed as it may cause real errors to get ignored. If someone uses a
compiler
that really needs the flag this flag should be set by the user explicitely.
Most users will never set any flags and probably never notice that they use
a
flag they shouldn't.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 280faa0..19c156e 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -491,7 +491,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
[Cmake-commits] CMake branch, master, updated. v2.8.10.2-1024-g619fa2c
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 619fa2cce851728790986108e6519e7f440387ee (commit) from ff298fff79b2dd9773f027573c7f862a18e0bc36 (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=619fa2cce851728790986108e6519e7f440387ee commit 619fa2cce851728790986108e6519e7f440387ee Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed May 8 00:01:03 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed May 8 00:01:03 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6455a87..ac680d4 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 10) -set(CMake_VERSION_TWEAK 20130507) +set(CMake_VERSION_TWEAK 20130508) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.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
