[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-156-gd4283ca
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 d4283ca18b75a218642b8d446ba52be08e135852 (commit) from f3d76a88b7d95b9275839c8270941557797e79fe (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4283ca18b75a218642b8d446ba52be08e135852 commit d4283ca18b75a218642b8d446ba52be08e135852 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Fri Jun 17 00:01:07 2016 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Fri Jun 17 00:01:07 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3c49d03..7e8a46a 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160616) +set(CMake_VERSION_PATCH 20160617) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[CMake] QT + CMake + Visual Studio = ui files refresh
Hi, I am currently using QT + CMake + Visual Studio and everything works great. Problem I am having is that if I change a .ui file Visual Studio does not seem to capture that during the build. If I just "touch" the header file, them everything works fine (moc gets triggered). Is there a way to set this up so that the ui file change also gets detected? I tried simply adding the ui file to the target, but this does not seem to work... Tiago -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] cmake install target doesn't run ldconfig after installing library
Thanks! This command really solve my problem. But I still get a problem about the command order now. I have some sub directories. For e.g. One of them is called "src" and there is also a CMakeLists.txt in it. And the shared library installation instructions are in it. So I have `ADD_SUBDIRECTORY(src)` in my main CMakeLists.txt. I put the command `install(CODE "execute_process(COMMAND ldconfig)")` after `ADD_SUBDIRECTORY(src)` . But It still run ldconfig before the installation of shared libraries in src sub folder. On Thu, Jun 16, 2016 at 9:02 PM, Matthew Keelerwrote: > CMake won’t and in my opinion shouldn’t implicitly invoke ldconfig for > you. There are many scenarios and platforms where this is incorrect > behavior and some such as running install to prepare for packaging that > CMake wouldn’t reliably be able to detect. > > If you want to provide the functionality for your users you could add > something like the following to your CMakeLists.txt: > > install(CODE “execute_process(COMMAND ldconfig)”) > > This will need to run after your other installed targets. I can’t find any > way in the CMake documentation to force install ordering but it seems like > as long as CMake processes that install command last it will perform it > last. So at the very end of your top level CMakeLists.txt file should do > the trick. > > -- > Matt Keeler > > > On June 15, 2016 at 22:12:09, Young Yang (afe.yo...@gmail.com) wrote: > > Hi, > I've encountered some problem when writing install target with cmake. > > I use `install (TARGETS DESTINATION lib)` to install > my shared_library. > However, when I run `make install`. It just install the .so to > /usr/local/lib and didn't run the ldconfig. > > I think it is strange and inconvenient to tell the user he should run > ldconfig by himself or herself. > > What is the best way to make the ldconfig run automatically? > > > Thanks in advance :) > > -- > Best wishes, > Young Yang > -- > > Powered by www.kitware.com > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake > > -- Best wishes, Young Yang -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] oversubscribing OpenMPI in tests
Excellent, this is far better than any of the approaches I had thought of... cheers! On Thu, Jun 16, 2016 at 4:45 PM Thompson, KTwrote: > Zaak, > > > > I use ‘execute_process (${MPIEXEC} --version)’ and match the output to a > string (Open MPI, ALPS, MPICH). This isn’t the most elegant solution, but > it seems fairly robust. > > > > -kt > > > > *From:* CMake [mailto:cmake-boun...@cmake.org] *On Behalf Of *Zaak Beekman > *Sent:* Thursday, June 16, 2016 9:14 AM > *To:* cmake@cmake.org > *Subject:* [CMake] oversubscribing OpenMPI in tests > > > > Does anyone know a good way to determine if `find_package(MPI REQUIRED)` > is returning OpenMPI? I need to know, because OpenMPI does not handle > oversubscribed (more ranks than cores) tests well without explicitly > telling OpenMPI that you are oversubscribing. This can be done by creating > a hosts file, and passing some flags to `mpirun` to tell it to use the > hosts file, or can be accomplished by passing the `--oversubscribe` flag. > The problem is that MPICH has different flags/host-file syntax. > > > > (I am oversubscribing some of the project's tests because this will often > find correctness problems due to race conditions or other parallel > programming errors that are not always exposed otherwise.) > -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-356-g85bdd35
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 85bdd3582b2a771107b1552c978aac50deff0868 (commit) via e6326db0c3870691e085df32e9af117f7c27ee2a (commit) from 7f71c4e28b43f1eaa78a0227f97eac653eabebe0 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85bdd3582b2a771107b1552c978aac50deff0868 commit 85bdd3582b2a771107b1552c978aac50deff0868 Merge: 7f71c4e e6326db Author: Daniel PfeiferAuthorDate: Thu Jun 16 18:18:34 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 18:18:34 2016 -0400 Merge topic 'iwyu-test' into next e6326db0 Revert "Apply include-what-you-use to some example files" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6326db0c3870691e085df32e9af117f7c27ee2a commit e6326db0c3870691e085df32e9af117f7c27ee2a Author: Daniel Pfeifer AuthorDate: Fri Jun 17 00:18:13 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Jun 17 00:18:13 2016 +0200 Revert "Apply include-what-you-use to some example files" This reverts commit a3e364aab92c1bdda63b39e3a7973a46919e3b6a. diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index f4349b5..235cf88 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -14,15 +14,9 @@ #include "cmLocale.h" #include "cmSystemTools.h" #include "cm_get_date.h" - #include -#include #include -#include #include -#include -#include -#include #ifndef __LA_SSIZE_T #define __LA_SSIZE_T la_ssize_t diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h index 65e1c24..72d8f3a 100644 --- a/Source/cmArchiveWrite.h +++ b/Source/cmArchiveWrite.h @@ -12,12 +12,7 @@ #ifndef cmArchiveWrite_h #define cmArchiveWrite_h -#include // IWYU pragma: keep - -#include -#include -#include -#include +#include "cmStandardIncludes.h" #if !defined(CMAKE_BUILD_WITH_CMAKE) #error "cmArchiveWrite not allowed during bootstrap build!" diff --git a/Source/cmCLocaleEnvironmentScope.cxx b/Source/cmCLocaleEnvironmentScope.cxx index 0e381db..a19dbae 100644 --- a/Source/cmCLocaleEnvironmentScope.cxx +++ b/Source/cmCLocaleEnvironmentScope.cxx @@ -15,7 +15,6 @@ #include "cmSystemTools.h" #include -#include cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope() { diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h index 572beaf..b011741 100644 --- a/Source/cmCLocaleEnvironmentScope.h +++ b/Source/cmCLocaleEnvironmentScope.h @@ -13,10 +13,7 @@ #ifndef cmCLocaleEnvironmentScope_h #define cmCLocaleEnvironmentScope_h -#include // IWYU pragma: keep - -#include -#include +#include "cmStandardIncludes.h" class cmCLocaleEnvironmentScope { diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 25f7cd3..bcef3c8 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -16,11 +16,10 @@ #include "cmVersion.h" #include "cmake.h" -#include +#include +#include #include -#include -#include -#include +#include cmCacheManager::cmCacheManager() { diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 8ae563b..153e957 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -12,19 +12,12 @@ #ifndef cmCacheManager_h #define cmCacheManager_h -#include // IWYU pragma: keep +#include "cmStandardIncludes.h" #include "cmPropertyMap.h" #include "cmState.h" -#include -#include -#include -#include -#include -#include - -class cmake; +class cmMarkAsAdvancedCommand; /** \class cmCacheManager * \brief Control class for cmake's cache --- Summary of changes: Source/cmArchiveWrite.cxx|6 -- Source/cmArchiveWrite.h |7 +-- Source/cmCLocaleEnvironmentScope.cxx |1 - Source/cmCLocaleEnvironmentScope.h |5 + Source/cmCacheManager.cxx|7 +++ Source/cmCacheManager.h | 11 ++- 6 files changed, 7 insertions(+), 30 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [CMake] oversubscribing OpenMPI in tests
Zaak, I use ‘execute_process (${MPIEXEC} --version)’ and match the output to a string (Open MPI, ALPS, MPICH). This isn’t the most elegant solution, but it seems fairly robust. -kt From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of Zaak Beekman Sent: Thursday, June 16, 2016 9:14 AM To: cmake@cmake.org Subject: [CMake] oversubscribing OpenMPI in tests Does anyone know a good way to determine if `find_package(MPI REQUIRED)` is returning OpenMPI? I need to know, because OpenMPI does not handle oversubscribed (more ranks than cores) tests well without explicitly telling OpenMPI that you are oversubscribing. This can be done by creating a hosts file, and passing some flags to `mpirun` to tell it to use the hosts file, or can be accomplished by passing the `--oversubscribe` flag. The problem is that MPICH has different flags/host-file syntax. (I am oversubscribing some of the project's tests because this will often find correctness problems due to race conditions or other parallel programming errors that are not always exposed otherwise.) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-352-g6493db0
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 6493db09edb969b292538b4011bd9075d956063d (commit) via a3e364aab92c1bdda63b39e3a7973a46919e3b6a (commit) from c3e9f7396581ff316be231fdd85bb0dfd2503596 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6493db09edb969b292538b4011bd9075d956063d commit 6493db09edb969b292538b4011bd9075d956063d Merge: c3e9f73 a3e364a Author: Daniel PfeiferAuthorDate: Thu Jun 16 14:57:04 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 14:57:04 2016 -0400 Merge topic 'iwyu-test' into next a3e364aa Apply include-what-you-use to some example files https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3e364aab92c1bdda63b39e3a7973a46919e3b6a commit a3e364aab92c1bdda63b39e3a7973a46919e3b6a Author: Daniel Pfeifer AuthorDate: Thu Jun 16 20:54:55 2016 +0200 Commit: Daniel Pfeifer CommitDate: Thu Jun 16 20:54:55 2016 +0200 Apply include-what-you-use to some example files diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index 235cf88..f4349b5 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -14,9 +14,15 @@ #include "cmLocale.h" #include "cmSystemTools.h" #include "cm_get_date.h" + #include +#include #include +#include #include +#include +#include +#include #ifndef __LA_SSIZE_T #define __LA_SSIZE_T la_ssize_t diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h index 72d8f3a..65e1c24 100644 --- a/Source/cmArchiveWrite.h +++ b/Source/cmArchiveWrite.h @@ -12,7 +12,12 @@ #ifndef cmArchiveWrite_h #define cmArchiveWrite_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep + +#include +#include +#include +#include #if !defined(CMAKE_BUILD_WITH_CMAKE) #error "cmArchiveWrite not allowed during bootstrap build!" diff --git a/Source/cmCLocaleEnvironmentScope.cxx b/Source/cmCLocaleEnvironmentScope.cxx index a19dbae..0e381db 100644 --- a/Source/cmCLocaleEnvironmentScope.cxx +++ b/Source/cmCLocaleEnvironmentScope.cxx @@ -15,6 +15,7 @@ #include "cmSystemTools.h" #include +#include cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope() { diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h index b011741..572beaf 100644 --- a/Source/cmCLocaleEnvironmentScope.h +++ b/Source/cmCLocaleEnvironmentScope.h @@ -13,7 +13,10 @@ #ifndef cmCLocaleEnvironmentScope_h #define cmCLocaleEnvironmentScope_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep + +#include +#include class cmCLocaleEnvironmentScope { diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index bcef3c8..25f7cd3 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -16,10 +16,11 @@ #include "cmVersion.h" #include "cmake.h" -#include -#include +#include #include -#include +#include +#include +#include cmCacheManager::cmCacheManager() { diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 153e957..8ae563b 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -12,12 +12,19 @@ #ifndef cmCacheManager_h #define cmCacheManager_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include "cmPropertyMap.h" #include "cmState.h" -class cmMarkAsAdvancedCommand; +#include +#include +#include +#include +#include +#include + +class cmake; /** \class cmCacheManager * \brief Control class for cmake's cache --- Summary of changes: Source/cmArchiveWrite.cxx|6 ++ Source/cmArchiveWrite.h |7 ++- Source/cmCLocaleEnvironmentScope.cxx |1 + Source/cmCLocaleEnvironmentScope.h |5 - Source/cmCacheManager.cxx|7 --- Source/cmCacheManager.h | 11 +-- 6 files changed, 30 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-350-gc3e9f73
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 c3e9f7396581ff316be231fdd85bb0dfd2503596 (commit) via d0adee7c496d08e8702a378ab841989568cd0f27 (commit) from 6ba4954cb9787ea034f3f8d56003aad8130e4465 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3e9f7396581ff316be231fdd85bb0dfd2503596 commit c3e9f7396581ff316be231fdd85bb0dfd2503596 Merge: 6ba4954 d0adee7 Author: Bill HoffmanAuthorDate: Thu Jun 16 14:13:24 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 14:13:24 2016 -0400 Merge topic 'link_what_you_use' into next d0adee7c Add support for ldd -u -r as link what you use tool. diff --cc Source/cmMakefileExecutableTargetGenerator.cxx index f2c7bc8,9c34125..ca0fdcb --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@@ -187,10 -187,13 +187,14 @@@ void cmMakefileExecutableTargetGenerato this->LocalGenerator->AppendFlags( linkFlags, this->Makefile->GetDefinition(export_flag_var)); } + if(this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) { + this->LocalGenerator->AppendFlags(linkFlags, + " -Wl,--no-as-needed"); + } // Add language feature flags. - this->AddFeatureFlags(flags, linkLanguage); + this->LocalGenerator->AddFeatureFlags(flags, linkLanguage, +this->GeneratorTarget); this->LocalGenerator->AddArchitectureFlags(flags, this->GeneratorTarget, linkLanguage, this->ConfigName); https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0adee7c496d08e8702a378ab841989568cd0f27 commit d0adee7c496d08e8702a378ab841989568cd0f27 Author: Bill Hoffman AuthorDate: Thu Jun 2 18:08:30 2016 -0400 Commit: Bill Hoffman CommitDate: Thu Jun 16 14:12:20 2016 -0400 Add support for ldd -u -r as link what you use tool. diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 3403dcd..6a7560a 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -217,6 +217,7 @@ Properties on Targets /prop_tgt/LINK_LIBRARIES /prop_tgt/LINK_SEARCH_END_STATIC /prop_tgt/LINK_SEARCH_START_STATIC + /prop_tgt/LINK_WHAT_YOU_USE /prop_tgt/LOCATION_CONFIG /prop_tgt/LOCATION /prop_tgt/MACOSX_BUNDLE_INFO_PLIST diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 85b8eae..36d00dc 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -275,6 +275,7 @@ Variables that Control the Build /variable/CMAKE_LINK_INTERFACE_LIBRARIES /variable/CMAKE_LINK_LIBRARY_FILE_FLAG /variable/CMAKE_LINK_LIBRARY_FLAG + /variable/CMAKE_LINK_WHAT_YOU_USE /variable/CMAKE_MACOSX_BUNDLE /variable/CMAKE_MACOSX_RPATH /variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG diff --git a/Help/prop_tgt/LINK_WHAT_YOU_USE.rst b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst new file mode 100644 index 000..32d6edb --- /dev/null +++ b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst @@ -0,0 +1,15 @@ +LINK_WHAT_YOU_USE +--- + +This is a boolean option that when set to ``TRUE`` will automatically run +``ldd -r -u`` on the target after it is linked. In addition, the linker flag +``-Wl,--no-as-needed`` will be passed to the target with the link command so +that all libraries specified on the command line will be linked into the +target. This will result in the link producing a list of libraries that +provide no symbols used by this target but are being linked to it. +This is only applicable to executable and shared library targets and +will only work when ld and ldd accept the flags used. + +This property is initialized by the value of +the :variable:`CMAKE_LINK_WHAT_YOU_USE` variable if it is set +when a target is created. diff --git a/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst b/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst new file mode 100644 index 000..90c4d3f --- /dev/null +++ b/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst @@ -0,0 +1,6 @@ +CMAKE_LINK_WHAT_YOU_USE +- + +Default value for :prop_tgt:`LINK_WHAT_YOU_USE` target property. +This variable is used to initialize the property on each target as it is +created. diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 9d42257..9c34125 100644 ---
Re: [cmake-developers] Toward a more deterministic ninja generator
On 06/14/2016 11:18 AM, Nicolas Desprès wrote: > It makes the ninja generator more deterministic by sorting the > build edge's inputs/outputs. It does not introduce any > regression on my macbookpro. > > This could help to fix issue #15968. What examples of non-determinism have you observed after the changes already made for that issue? > + // We assume that commands using $in and $out varialbes do not care > + // about the order of their inputs/outputs files, but commands that do > + // not use them do care (like custom commands for instance). I'd prefer not to make this assumption. CMake should order the inputs and outputs in a deterministic way before getting to the code in question. If that is not happening then there may be a deeper problem. Sorting this late is fixing the symptom. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] codeblocks generator: Fix include directories being in unexpected order
On 06/14/2016 11:52 AM, Tobias Hunger wrote: > https://github.com/hunger/CMake/commit/f190b069db2e430fd94b25e6287cd7fbc28661e3 > > Is the same thing updated based on suggestions from Stephen. Thanks, applied: cmExtraCodeBlocksGenerator: Do not shuffle include directories https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f190b069 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] cmake targeting vs2015 error
Update: I tried cmake 3.5.2, and that worked fine. BTW, I am trying to compile llvm+clang 3.5 with VS2015. On Wed, Jun 15, 2016 at 1:36 PM, Kristianwrote: > Could you give us either the CMakeLists.txt or the whole cl command, which > was called? > > Without of some more information, I could not give you a hint, where the > problem is. > > 2016-06-15 14:43 GMT-04:00 Welson Sun : > >> cmake 3.4.3 on windows 7 targeting vs2015 error out: >> >> cl : Command line error D8021: invalid numeric argument >> '/Wno-variadic-macros' >> >> >> Thanks, >> Welson >> >> -- >> >> Powered by www.kitware.com >> >> Please keep messages on-topic and check the CMake FAQ at: >> http://www.cmake.org/Wiki/CMake_FAQ >> >> Kitware offers various services to support the CMake community. For more >> information on each offering, please visit: >> >> CMake Support: http://cmake.org/cmake/help/support.html >> CMake Consulting: http://cmake.org/cmake/help/consulting.html >> CMake Training Courses: http://cmake.org/cmake/help/training.html >> >> Visit other Kitware open-source projects at >> http://www.kitware.com/opensource/opensource.html >> >> Follow this link to subscribe/unsubscribe: >> http://public.kitware.com/mailman/listinfo/cmake >> > > -- - Welson -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] What do these CMake error messages mean?
CMake is giving many error messages like the below since we added OpenCV 3.1.0 to our project (and we need that new version). Can anyone help me understand what do about it and/or what the error messages are telling me? None of the 3 hits for this google search were helpful: opencv cmake "which is prefixed in the" - Howard Rubin Error messages == : : Configuring done CMake Error in 3rdparty/opencv-3.1.0/modules/core/CMakeLists.txt: Target "opencv_core" INTERFACE_INCLUDE_DIRECTORIES property contains path: "D:/shared/projects/magellan-build-windows" which is prefixed in the build directory. CMake Error in 3rdparty/opencv-3.1.0/modules/core/CMakeLists.txt: Target "opencv_core" INTERFACE_INCLUDE_DIRECTORIES property contains path: "D:/shared/projects/magellan/3rdparty/opencv-3.1.0/include" which is prefixed in the source directory. : : The referenced 3rdparty/opencv-3.1.0/modules/core/CMakeLists.txt = set(the_description "The Core Functionality") ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" OPTIONAL opencv_cudev WRAP java python) set(extra_libs "") if(WINRT AND CMAKE_SYSTEM_NAME MATCHES WindowsStore AND CMAKE_SYSTEM_VERSION MATCHES "8.0") list(APPEND extra_libs ole32.lib) endif() if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") endif() if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wenum-compare -Wunused-function -Wshadow) endif() file(GLOB lib_cuda_hdrs"include/opencv2/${name}/cuda/*.hpp" "include/opencv2/${name}/cuda/*.h") file(GLOB lib_cuda_hdrs_detail "include/opencv2/${name}/cuda/detail/*.hpp" "include/opencv2/${name}/cuda/detail/*.h") source_group("Cuda Headers" FILES ${lib_cuda_hdrs}) source_group("Cuda Headers\\Detail" FILES ${lib_cuda_hdrs_detail}) ocv_glob_module_sources(SOURCES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version_string.inc" HEADERS ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail}) ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS}) ocv_create_module(${extra_libs}) ocv_add_accuracy_tests() ocv_add_perf_tests() -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-348-g6ba4954
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 6ba4954cb9787ea034f3f8d56003aad8130e4465 (commit) via 3d41797a9bbfede841844606eda168c5b18cd49d (commit) via e1c8567cdc8bdaa8a205dde67f42eea1022d3a17 (commit) via 7fa9190d606b4f97d0929562f1f5854d7a3d8693 (commit) via 27fcb61ba413811df0649cbf4244081564ebc614 (commit) via 52572a26dfdfb7eaa0d28870e215bd00dcc1ec55 (commit) from 590681ade20a66d7ec2750c4acd510dcdad26e3e (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ba4954cb9787ea034f3f8d56003aad8130e4465 commit 6ba4954cb9787ea034f3f8d56003aad8130e4465 Merge: 590681a 3d41797 Author: Brad KingAuthorDate: Thu Jun 16 11:56:07 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 11:56:07 2016 -0400 Merge topic 'refactor-flags' into next 3d41797a cmLocalCommonGenerator: Adopt target compile flag generation e1c8567c cmLocalCommonGenerator: Adopt language and feature flag generation 7fa9190d cmLocalCommonGenerator: Adopt Fortran flag generation 27fcb61b cmGeneratorTarget: Adopt Fortran module directory generation 52572a26 Refactor Makefile/Ninja tool working directory storage https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d41797a9bbfede841844606eda168c5b18cd49d commit 3d41797a9bbfede841844606eda168c5b18cd49d Author: Tobias Hunger AuthorDate: Fri Jun 10 18:04:58 2016 +0200 Commit: Brad King CommitDate: Thu Jun 16 11:53:27 2016 -0400 cmLocalCommonGenerator: Adopt target compile flag generation Factor the flag generation out of cmCommonTargetGenerator::GetFlags into a new cmLocalCommonGenerator::GetTargetCompileFlags method. This will allow it to be used without a target generator available. diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 402c49f..69fd363 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -109,37 +109,9 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string& l) ByLanguageMap::iterator i = this->FlagsByLanguage.find(l); if (i == this->FlagsByLanguage.end()) { std::string flags; -const char* lang = l.c_str(); -// Add language feature flags. -this->LocalGenerator->AddFeatureFlags(flags, lang, this->GeneratorTarget); - -this->LocalGenerator->AddArchitectureFlags(flags, this->GeneratorTarget, - lang, this->ConfigName); - -// Fortran-specific flags computed for this target. -if (l == "Fortran") { - this->LocalGenerator->AppendFlags( -flags, this->LocalGenerator->GetFortranFlags(this->GeneratorTarget)); -} - -this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget, lang, - this->ConfigName); - -this->LocalGenerator->AddVisibilityPresetFlags( - flags, this->GeneratorTarget, lang); - -// Append old-style preprocessor definition flags. -this->LocalGenerator->AppendFlags(flags, this->Makefile->GetDefineFlags()); - -// Add framework directory flags. -this->LocalGenerator->AppendFlags( - flags, this->LocalGenerator->GetFrameworkFlags(l, this->ConfigName, - this->GeneratorTarget)); - -// Add target-specific flags. -this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget, lang, -this->ConfigName); +this->LocalGenerator->GetTargetCompileFlags(this->GeneratorTarget, l, +flags); ByLanguageMap::value_type entry(l, flags); i = this->FlagsByLanguage.insert(entry).first; diff --git a/Source/cmLocalCommonGenerator.cxx b/Source/cmLocalCommonGenerator.cxx index 2bfaea1..9086013 100644 --- a/Source/cmLocalCommonGenerator.cxx +++ b/Source/cmLocalCommonGenerator.cxx @@ -95,3 +95,23 @@ std::string cmLocalCommonGenerator::GetFortranFlags( return flags; } + +void cmLocalCommonGenerator::GetTargetCompileFlags(cmGeneratorTarget* target, + std::string const& lang, + std::string& flags) +{ + cmMakefile* mf = this->GetMakefile(); + + this->AddFeatureFlags(flags, lang, target); + this->AddArchitectureFlags(flags, target, lang, this->ConfigName); + + if (lang == "Fortran") { +this->AppendFlags(flags, this->GetFortranFlags(target)); + } + +
[CMake] oversubscribing OpenMPI in tests
Does anyone know a good way to determine if `find_package(MPI REQUIRED)` is returning OpenMPI? I need to know, because OpenMPI does not handle oversubscribed (more ranks than cores) tests well without explicitly telling OpenMPI that you are oversubscribing. This can be done by creating a hosts file, and passing some flags to `mpirun` to tell it to use the hosts file, or can be accomplished by passing the `--oversubscribe` flag. The problem is that MPICH has different flags/host-file syntax. (I am oversubscribing some of the project's tests because this will often find correctness problems due to race conditions or other parallel programming errors that are not always exposed otherwise.) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-342-g590681a
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 590681ade20a66d7ec2750c4acd510dcdad26e3e (commit) via f190b069db2e430fd94b25e6287cd7fbc28661e3 (commit) from 18ebcf28426e7d5b80b5005d1505588566009697 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=590681ade20a66d7ec2750c4acd510dcdad26e3e commit 590681ade20a66d7ec2750c4acd510dcdad26e3e Merge: 18ebcf2 f190b06 Author: Brad KingAuthorDate: Thu Jun 16 10:03:33 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 10:03:33 2016 -0400 Merge topic 'CodeBlocks-include-order' into next f190b069 cmExtraCodeBlocksGenerator: Do not shuffle include directories https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f190b069db2e430fd94b25e6287cd7fbc28661e3 commit f190b069db2e430fd94b25e6287cd7fbc28661e3 Author: Tobias Hunger AuthorDate: Tue Jun 14 17:16:57 2016 +0200 Commit: Tobias Hunger CommitDate: Tue Jun 14 17:50:20 2016 +0200 cmExtraCodeBlocksGenerator: Do not shuffle include directories Report include directories in a sensible order. Do not shuffle them when trying to make them unique. diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 8c656b9..7bd0012 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -578,19 +578,20 @@ void cmExtraCodeBlocksGenerator::AppendTarget( } // the include directories for this target -std::set uniqIncludeDirs; +std::vector allIncludeDirs; std::vector includes; lg->GetIncludeDirectories(includes, target, "C", buildType); -uniqIncludeDirs.insert(includes.begin(), includes.end()); +allIncludeDirs.insert(allIncludeDirs.end(), includes.begin(), + includes.end()); std::string systemIncludeDirs = makefile->GetSafeDefinition( "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { std::vector dirs; cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); - uniqIncludeDirs.insert(dirs.begin(), dirs.end()); + allIncludeDirs.insert(allIncludeDirs.end(), dirs.begin(), dirs.end()); } systemIncludeDirs = makefile->GetSafeDefinition( @@ -598,13 +599,16 @@ void cmExtraCodeBlocksGenerator::AppendTarget( if (!systemIncludeDirs.empty()) { std::vector dirs; cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); - uniqIncludeDirs.insert(dirs.begin(), dirs.end()); + allIncludeDirs.insert(allIncludeDirs.end(), dirs.begin(), dirs.end()); } -for (std::set::const_iterator dirIt = uniqIncludeDirs.begin(); - dirIt != uniqIncludeDirs.end(); ++dirIt) { +std::vector::const_iterator end = + cmRemoveDuplicates(allIncludeDirs); + +for (std::vector::const_iterator i = allIncludeDirs.begin(); + i != end; ++i) { xml.StartElement("Add"); - xml.Attribute("directory", *dirIt); + xml.Attribute("directory", *i); xml.EndElement(); } --- Summary of changes: Source/cmExtraCodeBlocksGenerator.cxx | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-340-g18ebcf2
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 18ebcf28426e7d5b80b5005d1505588566009697 (commit) via afd6cc6b923af63faebe9ccbad3a8ccd950e1782 (commit) from b8ae6f14b838e364960540bc51c88f751e88395e (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18ebcf28426e7d5b80b5005d1505588566009697 commit 18ebcf28426e7d5b80b5005d1505588566009697 Merge: b8ae6f1 afd6cc6 Author: Brad KingAuthorDate: Thu Jun 16 09:56:18 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:56:18 2016 -0400 Merge topic 'CodeBlocks-generated-sources' into next afd6cc6b CodeBlocks: Show generated files in non-utility targets https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afd6cc6b923af63faebe9ccbad3a8ccd950e1782 commit afd6cc6b923af63faebe9ccbad3a8ccd950e1782 Author: Enrico Bedau AuthorDate: Thu Jun 16 08:39:07 2016 +0200 Commit: Brad King CommitDate: Thu Jun 16 09:55:29 2016 -0400 CodeBlocks: Show generated files in non-utility targets Since 2.6.3 the UTILITY target may have source files. A defect was filed that these files are now visible in the source tree. A fix later removed all generated files from the source tree, regardless of the target type. You can't even include them by using the SOURCES option. This fix adds generated files again, except for the UTILITY target which cluttered the source tree. Fixes #14272. diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 8c656b9..28d1d48 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -376,8 +376,10 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile( makefile->GetSafeDefinition("CMAKE_BUILD_TYPE")); for (std::vector ::const_iterator si = sources.begin(); si != sources.end(); si++) { -// don't add source files which have the GENERATED property set: -if ((*si)->GetPropertyAsBool("GENERATED")) { +// don't add source files from UTILITY target which have the +// GENERATED property set: +if (gt->GetType() == cmState::UTILITY && +(*si)->GetPropertyAsBool("GENERATED")) { continue; } --- Summary of changes: Source/cmExtraCodeBlocksGenerator.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-155-gf3d76a8
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 f3d76a88b7d95b9275839c8270941557797e79fe (commit) via 82ecc2a3a872a8db82ab1a8a5d2c35882b4a9757 (commit) from a854e1795fbbde165d11a26301a08c2b332da09d (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3d76a88b7d95b9275839c8270941557797e79fe commit f3d76a88b7d95b9275839c8270941557797e79fe Merge: a854e17 82ecc2a Author: Brad KingAuthorDate: Thu Jun 16 09:52:58 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:52:58 2016 -0400 Merge topic 'ice-3.6.2' 82ecc2a3 FindIce: Add versions 3.6.1 and 3.6.2 --- Summary of changes: Modules/FindIce.cmake |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-338-gb8ae6f1
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 b8ae6f14b838e364960540bc51c88f751e88395e (commit) via f3d76a88b7d95b9275839c8270941557797e79fe (commit) from 7e690ba25ee08522f769350cce87a51a7e8e4148 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8ae6f14b838e364960540bc51c88f751e88395e commit b8ae6f14b838e364960540bc51c88f751e88395e Merge: 7e690ba f3d76a8 Author: Brad KingAuthorDate: Thu Jun 16 09:53:12 2016 -0400 Commit: Brad King CommitDate: Thu Jun 16 09:53:12 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-336-g7e690ba
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 7e690ba25ee08522f769350cce87a51a7e8e4148 (commit) via a854e1795fbbde165d11a26301a08c2b332da09d (commit) via 0e523d0612f50373486c2c2360004bb8ce859f92 (commit) via 993991a07de48079233b3a04902a1f34ddfb97df (commit) via 290913fab871eddee22e6ebadd3eb7ef48c1485b (commit) via 84c0fdb192ccdad66dc00064b6113d7a1e63944a (commit) via 2701b519b17dc59b81bbf573095bfeb6fc03f326 (commit) via ce624540199a4685e04425a7668e8f2e0384267d (commit) from 6c212eb38d32ddbd7a79a767726ef0f89b71217e (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e690ba25ee08522f769350cce87a51a7e8e4148 commit 7e690ba25ee08522f769350cce87a51a7e8e4148 Merge: 6c212eb a854e17 Author: Brad KingAuthorDate: Thu Jun 16 09:47:08 2016 -0400 Commit: Brad King CommitDate: Thu Jun 16 09:47:08 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-151-g0e523d0
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 0e523d0612f50373486c2c2360004bb8ce859f92 (commit) via ed5fa48d50ea0605b47598ff5b1d765548e8d638 (commit) via 24ab29b882548d9eceeb20d3ecbc5b9cc918bb7c (commit) via ab8b77dd33e9a13551af402b2cf7ee3aaa5486b8 (commit) via eb79fa726090410dbfceb64e29604320cc65d92f (commit) from 993991a07de48079233b3a04902a1f34ddfb97df (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e523d0612f50373486c2c2360004bb8ce859f92 commit 0e523d0612f50373486c2c2360004bb8ce859f92 Merge: 993991a ed5fa48 Author: Brad KingAuthorDate: Thu Jun 16 09:46:54 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:54 2016 -0400 Merge topic 'cleanup-streams' ed5fa48d cmXMLWriter: use ifstream from KWSys 24ab29b8 Prefer istringstream and ostringstream over stringstream. ab8b77dd Remove redundant arguments from fstream constructors eb79fa72 Access std::ios_base with std::ios --- Summary of changes: Source/CPack/IFW/cmCPackIFWGenerator.cxx |2 +- Source/CPack/IFW/cmCPackIFWPackage.cxx|2 +- Source/CPack/WiX/cmCPackWIXGenerator.cxx | 12 ++--- Source/CPack/WiX/cmWIXAccessControlList.cxx |2 +- Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |2 +- Source/CPack/WiX/cmWIXFilesSourceWriter.cxx |2 +- Source/CPack/WiX/cmWIXPatchParser.cxx |2 +- Source/CPack/cmCPackDragNDropGenerator.cxx|2 +- Source/CTest/cmCTestTestHandler.cxx |2 +- Source/cmCLocaleEnvironmentScope.cxx |4 +- Source/cmCMakeHostSystemInformationCommand.cxx|2 +- Source/cmDependsFortran.cxx |4 +- Source/cmDocumentation.cxx|2 +- Source/cmExtraEclipseCDT4Generator.cxx|4 +- Source/cmFileCommand.cxx |4 +- Source/cmGeneratedFileStream.cxx |2 +- Source/cmGeneratorTarget.cxx |4 +- Source/cmGlobalGenerator.cxx |2 +- Source/cmGlobalNinjaGenerator.cxx |4 +- Source/cmInstallTargetGenerator.cxx |2 +- Source/cmMakefile.cxx |2 +- Source/cmQtAutoGeneratorInitializer.cxx |6 +-- Source/cmQtAutoGenerators.cxx | 58 ++--- Source/cmTimestamp.cxx|2 +- Source/cmXMLWriter.cxx|4 +- Source/cmake.cxx |2 +- Source/cmcldeps.cxx |2 +- Tests/AliasTarget/commandgenerator.cpp|3 +- Tests/AliasTarget/targetgenerator.cpp |3 +- 29 files changed, 71 insertions(+), 73 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-144-g290913f
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 290913fab871eddee22e6ebadd3eb7ef48c1485b (commit) via 1c2c629769e1bca0cee9e25293c88bfa060e692b (commit) via ffdc0a8e2877605f0c7f786ec0a2536db4a71f34 (commit) via e4eb88e21dab2f887b2a974ed89358f398418499 (commit) via 535ec2bf1a57375221259ed1041c6d8d35c79b91 (commit) via c3819acad22c1bc0f763f7222648e8cade777ca6 (commit) from 84c0fdb192ccdad66dc00064b6113d7a1e63944a (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=290913fab871eddee22e6ebadd3eb7ef48c1485b commit 290913fab871eddee22e6ebadd3eb7ef48c1485b Merge: 84c0fdb 1c2c629 Author: Brad KingAuthorDate: Thu Jun 16 09:46:49 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:49 2016 -0400 Merge topic 'iwyu-preparation' 1c2c6297 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h ffdc0a8e cmTypeMacro: Extract from cmStandardIncludes.h e4eb88e2 cmCustomCommandLines: Extract from cmStandardIncludes.h 535ec2bf cmDocumentationEntry: Extract from cmStandardIncludes c3819aca cmConfigure.h: Establish as 'include first' file --- Summary of changes: Source/cmConfigure.cmake.h.in | 17 Source/cmCustomCommandLines.h | 38 + .../cmCTestCommand.h => cmDocumentationEntry.h}| 47 ++- Source/cmStandardIncludes.h| 88 +--- ...ndFileCommand.cxx => cmTargetLinkLibraryType.h} | 15 ++-- Source/cmTypeMacro.h | 37 6 files changed, 130 insertions(+), 112 deletions(-) create mode 100644 Source/cmCustomCommandLines.h copy Source/{CTest/cmCTestCommand.h => cmDocumentationEntry.h} (50%) copy Source/{cmFindFileCommand.cxx => cmTargetLinkLibraryType.h} (76%) create mode 100644 Source/cmTypeMacro.h hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-138-g84c0fdb
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 84c0fdb192ccdad66dc00064b6113d7a1e63944a (commit) via 5bbcf758a1a0c52836d313156788a10a232f1f9f (commit) via 262ce91e8ac3c6fc9b09605e652028db7229b9b8 (commit) from 2701b519b17dc59b81bbf573095bfeb6fc03f326 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84c0fdb192ccdad66dc00064b6113d7a1e63944a commit 84c0fdb192ccdad66dc00064b6113d7a1e63944a Merge: 2701b51 5bbcf75 Author: Brad KingAuthorDate: Thu Jun 16 09:46:47 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:47 2016 -0400 Merge topic 'clean-up-cmMakefile-IssueMessage' 5bbcf758 cmIfCommand: Don't rely on NestedError logic to issue messages 262ce91e cmMakefile: Extract invoke result variables --- Summary of changes: Source/cmIfCommand.cxx |6 +++--- Source/cmMakefile.cxx |7 --- 2 files changed, 7 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-153-ga854e17
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 a854e1795fbbde165d11a26301a08c2b332da09d (commit) via d645b03e9c97856436b9fcd517b2c33b8aa3302c (commit) from 0e523d0612f50373486c2c2360004bb8ce859f92 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a854e1795fbbde165d11a26301a08c2b332da09d commit a854e1795fbbde165d11a26301a08c2b332da09d Merge: 0e523d0 d645b03 Author: Brad KingAuthorDate: Thu Jun 16 09:46:56 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:56 2016 -0400 Merge topic 'cmOutputConverter-stringstream' d645b03e cmOutputConverter: implement Shell__GetArgument using ostringstream --- Summary of changes: Source/cmOutputConverter.cxx | 214 +++--- Source/cmOutputConverter.h | 17 +--- 2 files changed, 39 insertions(+), 192 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-135-g2701b51
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 2701b519b17dc59b81bbf573095bfeb6fc03f326 (commit) via 905e738ffeb1ec1b5d1a376b99e300a8787f7255 (commit) via 0a9094cd1017057d3c5141fdacdc6a89fb14acfc (commit) from ce624540199a4685e04425a7668e8f2e0384267d (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2701b519b17dc59b81bbf573095bfeb6fc03f326 commit 2701b519b17dc59b81bbf573095bfeb6fc03f326 Merge: ce62454 905e738 Author: Brad KingAuthorDate: Thu Jun 16 09:46:44 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:44 2016 -0400 Merge topic 'clean-up-Parser' 905e738f Parser: Out-of-line conditional code to cmMakefile 0a9094cd Parser: Issue file open error messages through dedicated API --- Summary of changes: Source/cmListFileCache.cxx | 87 +++- Source/cmListFileCache.h |2 +- Source/cmMakefile.cxx | 79 +++-- Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt |6 +- Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt |6 +- Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt |6 +- Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt |6 +- 7 files changed, 90 insertions(+), 102 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-146-g993991a
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 993991a07de48079233b3a04902a1f34ddfb97df (commit) via 90d114ed8c724ca49fa02444dd59d06fd9806f3b (commit) from 290913fab871eddee22e6ebadd3eb7ef48c1485b (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=993991a07de48079233b3a04902a1f34ddfb97df commit 993991a07de48079233b3a04902a1f34ddfb97df Merge: 290913f 90d114e Author: Brad KingAuthorDate: Thu Jun 16 09:46:52 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:52 2016 -0400 Merge topic 'findcuda-use-correct-runtime-for-required' 90d114ed FindCUDA: Use the correct runtime in REQUIRED_VARS check --- Summary of changes: Modules/FindCUDA.cmake |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-132-gce62454
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 ce624540199a4685e04425a7668e8f2e0384267d (commit) via 919db25c3b54f0303a19abb4a9e4f16056a3c1b6 (commit) via ebf18df58083c90d4ba06ab896dfad8df9fe6ade (commit) from 83ae79442c8bc16cca72977e0671845efe191696 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce624540199a4685e04425a7668e8f2e0384267d commit ce624540199a4685e04425a7668e8f2e0384267d Merge: 83ae794 919db25 Author: Brad KingAuthorDate: Thu Jun 16 09:46:42 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:46:42 2016 -0400 Merge topic 'find_package-duplicate-search-paths' 919db25c cmFindPackageCommand: remove duplicate paths from error message ebf18df5 cmFindPackageCommand: use iterators to loop over configurations --- Summary of changes: Source/cmFindPackageCommand.cxx | 19 +++ Source/cmFindPackageCommand.h | 15 +++ 2 files changed, 26 insertions(+), 8 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-328-g6c212eb
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 6c212eb38d32ddbd7a79a767726ef0f89b71217e (commit) via 1c2c629769e1bca0cee9e25293c88bfa060e692b (commit) via ffdc0a8e2877605f0c7f786ec0a2536db4a71f34 (commit) via e4eb88e21dab2f887b2a974ed89358f398418499 (commit) from 99beaa936fa48e567cc72311ff2401eb9799820f (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c212eb38d32ddbd7a79a767726ef0f89b71217e commit 6c212eb38d32ddbd7a79a767726ef0f89b71217e Merge: 99beaa9 1c2c629 Author: Brad KingAuthorDate: Thu Jun 16 09:28:57 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:28:57 2016 -0400 Merge topic 'iwyu-preparation' into next 1c2c6297 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h ffdc0a8e cmTypeMacro: Extract from cmStandardIncludes.h e4eb88e2 cmCustomCommandLines: Extract from cmStandardIncludes.h https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2c629769e1bca0cee9e25293c88bfa060e692b commit 1c2c629769e1bca0cee9e25293c88bfa060e692b Author: Daniel Pfeifer AuthorDate: Sun Jun 12 22:49:18 2016 +0200 Commit: Brad King CommitDate: Thu Jun 16 09:26:50 2016 -0400 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 047eded..606978e 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -57,13 +57,7 @@ extern void operator<<(std::ostream&, const std::ostringstream&); #include "cmCustomCommandLines.h" #include "cmDocumentationEntry.h" +#include "cmTargetLinkLibraryType.h" #include "cmTypeMacro.h" -enum cmTargetLinkLibraryType -{ - GENERAL_LibraryType, - DEBUG_LibraryType, - OPTIMIZED_LibraryType -}; - #endif diff --git a/Source/cmTargetLinkLibraryType.h b/Source/cmTargetLinkLibraryType.h new file mode 100644 index 000..71ac9e7 --- /dev/null +++ b/Source/cmTargetLinkLibraryType.h @@ -0,0 +1,22 @@ +/* + CMake - Cross Platform Makefile Generator + Copyright 2000-2009 Kitware, Inc., Insight Software Consortium + + Distributed under the OSI-approved BSD License (the "License"); + see accompanying file Copyright.txt for details. + + This software is distributed WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License for more information. +*/ +#ifndef cmTargetLinkLibraryType_h +#define cmTargetLinkLibraryType_h + +enum cmTargetLinkLibraryType +{ + GENERAL_LibraryType, + DEBUG_LibraryType, + OPTIMIZED_LibraryType +}; + +#endif https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffdc0a8e2877605f0c7f786ec0a2536db4a71f34 commit ffdc0a8e2877605f0c7f786ec0a2536db4a71f34 Author: Daniel Pfeifer AuthorDate: Sun Jun 12 22:46:03 2016 +0200 Commit: Brad King CommitDate: Thu Jun 16 09:26:33 2016 -0400 cmTypeMacro: Extract from cmStandardIncludes.h diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 6a34fb6..047eded 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -57,28 +57,7 @@ extern void operator<<(std::ostream&, const std::ostringstream&); #include "cmCustomCommandLines.h" #include "cmDocumentationEntry.h" - -// All subclasses of cmCommand or cmCTestGenericHandler should -// invoke this macro. -#define cmTypeMacro(thisClass, superclass)\ - virtual const char* GetNameOfClass() { return #thisClass; } \ - typedef superclass Superclass; \ - static bool IsTypeOf(const char* type) \ - { \ -if (!strcmp(#thisClass, type)) { \ - return true;\ -} \ -return Superclass::IsTypeOf(type);\ - } \ - virtual bool IsA(const char* type) { return thisClass::IsTypeOf(type); }\ - static thisClass* SafeDownCast(cmObject* c) \ - {
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-324-g99beaa9
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 99beaa936fa48e567cc72311ff2401eb9799820f (commit) via f0d607ee9c24950978d8a2535cf45355020b5e34 (commit) from 947c899afda22a7b432c85cdf9bec6807b383311 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99beaa936fa48e567cc72311ff2401eb9799820f commit 99beaa936fa48e567cc72311ff2401eb9799820f Merge: 947c899 f0d607e Author: Brad KingAuthorDate: Thu Jun 16 09:28:30 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:28:30 2016 -0400 Merge topic 'iwyu-preparation' into next f0d607ee Revise topic 'iwyu-preparation' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0d607ee9c24950978d8a2535cf45355020b5e34 commit f0d607ee9c24950978d8a2535cf45355020b5e34 Author: Brad King AuthorDate: Thu Jun 16 09:27:34 2016 -0400 Commit: Brad King CommitDate: Thu Jun 16 09:27:39 2016 -0400 Revise topic 'iwyu-preparation' Fix clang-format. diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index acbf98b..606978e 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -55,9 +55,9 @@ typedef unsigned short mode_t; /* Poison this operator to avoid common mistakes. */ extern void operator<<(std::ostream&, const std::ostringstream&); -#include "cmDocumentationEntry.h" #include "cmCustomCommandLines.h" -#include "cmTypeMacro.h" +#include "cmDocumentationEntry.h" #include "cmTargetLinkLibraryType.h" +#include "cmTypeMacro.h" #endif --- Summary of changes: Source/cmStandardIncludes.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[cmake-developers] [patch] FindIce updates
I have opened a couple of merge requests here, and also merged these into next for testing: https://gitlab.kitware.com/cmake/cmake/merge_requests/17 https://gitlab.kitware.com/cmake/cmake/merge_requests/19 The first adds support for the latest 3.6.x releases. The second adds support for finding debug variants of the library, uses SelectLibraryConfigurations and adds support for release and debug variants to the imported targets. Regards, Roger -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-322-g947c899
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 947c899afda22a7b432c85cdf9bec6807b383311 (commit) via 86bcdbcde52988fe32e017700d2d0f759a2c2570 (commit) via 83ae79442c8bc16cca72977e0671845efe191696 (commit) from e1f12493456067dac78ca8d612b379844a30ea38 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947c899afda22a7b432c85cdf9bec6807b383311 commit 947c899afda22a7b432c85cdf9bec6807b383311 Merge: e1f1249 86bcdbc Author: Roger LeighAuthorDate: Thu Jun 16 09:24:30 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:24:30 2016 -0400 Merge topic 'ice-debug' into next 86bcdbcd FindIce: Support finding both release and debug libraries 83ae7944 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86bcdbcde52988fe32e017700d2d0f759a2c2570 commit 86bcdbcde52988fe32e017700d2d0f759a2c2570 Author: Roger Leigh AuthorDate: Thu Jun 16 11:21:15 2016 +0100 Commit: Roger Leigh CommitDate: Thu Jun 16 12:23:37 2016 +0100 FindIce: Support finding both release and debug libraries Search for both release and debug library variants, and use SelectLibraryConfigurations to choose the appropriate library. Also add both release and debug libraries to the imported targets. diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index 3fa6cab..4bd6d3c 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -360,12 +360,20 @@ function(_Ice_FIND) foreach(component ${Ice_FIND_COMPONENTS}) string(TOUPPER "${component}" component_upcase) set(component_cache "Ice_${component_upcase}_LIBRARY") +set(component_cache_release "${component_cache}_RELEASE") +set(component_cache_debug "${component_cache}_DEBUG") set(component_found "${component_upcase}_FOUND") -find_library("${component_cache}" "${component}" +find_library("${component_cache_release}" "${component}" HINTS ${ice_roots} PATH_SUFFIXES ${ice_library_suffixes} - DOC "Ice ${component} library") -mark_as_advanced("${component_cache}") + DOC "Ice ${component} library (release)") +find_library("${component_cache_debug}" "${component}d" + HINTS ${ice_roots} + PATH_SUFFIXES ${ice_library_suffixes} + DOC "Ice ${component} library (debug)") +include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) +select_library_configurations(Ice_${component_upcase}) +mark_as_advanced("${component_cache_release}" "${component_cache_debug}") if(${component_cache}) set("${component_found}" ON) list(APPEND Ice_LIBRARY "${${component_cache}}") @@ -438,6 +446,8 @@ if(Ice_FOUND) foreach(_Ice_component ${Ice_FIND_COMPONENTS}) string(TOUPPER "${_Ice_component}" _Ice_component_upcase) set(_Ice_component_cache "Ice_${_Ice_component_upcase}_LIBRARY") +set(_Ice_component_cache_release "Ice_${_Ice_component_upcase}_LIBRARY_RELEASE") +set(_Ice_component_cache_debug "Ice_${_Ice_component_upcase}_LIBRARY_DEBUG") set(_Ice_component_lib "Ice_${_Ice_component_upcase}_LIBRARIES") set(_Ice_component_found "${_Ice_component_upcase}_FOUND") set(_Ice_imported_target "Ice::${_Ice_component}") @@ -445,9 +455,29 @@ if(Ice_FOUND) set("${_Ice_component_lib}" "${${_Ice_component_cache}}") if(NOT TARGET ${_Ice_imported_target}) add_library(${_Ice_imported_target} UNKNOWN IMPORTED) -set_target_properties(${_Ice_imported_target} PROPERTIES - IMPORTED_LOCATION "${${_Ice_component_cache}}" - INTERFACE_INCLUDE_DIRECTORIES "${Ice_INCLUDE_DIR}") +if() + set_target_properties(${_Ice_imported_target} PROPERTIES +INTERFACE_INCLUDE_DIRECTORIES "${Ice_INCLUDE_DIR}") +endif() +if(EXISTS "${${_Ice_component_cache}}") + set_target_properties(${_Ice_imported_target} PROPERTIES +IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" +IMPORTED_LOCATION "${${_Ice_component_cache}}") +endif() +if(EXISTS "${${_Ice_component_cache_debug}}") + set_property(TARGET ${_Ice_imported_target} APPEND PROPERTY +IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(${_Ice_imported_target} PROPERTIES +IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" +IMPORTED_LOCATION_DEBUG "${${_Ice_component_cache_debug}}") +endif() +if(EXISTS "${${_Ice_component_cache_release}}") + set_property(TARGET
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-317-g14050cf
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 14050cfb2b3bb266284f27064cd15d2ef919e79e (commit) via be786eb44c782c8502c2c5253c5658a33e91eb5a (commit) from 5ce786e3d810391c2ed259e2ac0bad2d8ac5a9eb (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14050cfb2b3bb266284f27064cd15d2ef919e79e commit 14050cfb2b3bb266284f27064cd15d2ef919e79e Merge: 5ce786e be786eb Author: Brad KingAuthorDate: Thu Jun 16 09:17:57 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 16 09:17:57 2016 -0400 Merge topic 'xcode-mig-support' into next be786eb4 fixup! Xcode: Add function to conditionally add Xcode Attributes https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be786eb44c782c8502c2c5253c5658a33e91eb5a commit be786eb44c782c8502c2c5253c5658a33e91eb5a Author: Brad King AuthorDate: Thu Jun 16 09:17:49 2016 -0400 Commit: Brad King CommitDate: Thu Jun 16 09:17:49 2016 -0400 fixup! Xcode: Add function to conditionally add Xcode Attributes diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 919f8c9..fabf097 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -96,6 +96,7 @@ bool cmXCodeObject::IsEmpty() const case OBJECT: return this->Object == 0; } + return true; // unreachable, but quiets warnings } void cmXCodeObject::Indent(int level, std::ostream& out) --- Summary of changes: Source/cmXCodeObject.cxx |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [CMake] cmake install target doesn't run ldconfig after installing library
CMake won’t and in my opinion shouldn’t implicitly invoke ldconfig for you. There are many scenarios and platforms where this is incorrect behavior and some such as running install to prepare for packaging that CMake wouldn’t reliably be able to detect. If you want to provide the functionality for your users you could add something like the following to your CMakeLists.txt: install(CODE “execute_process(COMMAND ldconfig)”) This will need to run after your other installed targets. I can’t find any way in the CMake documentation to force install ordering but it seems like as long as CMake processes that install command last it will perform it last. So at the very end of your top level CMakeLists.txt file should do the trick. -- Matt Keeler On June 15, 2016 at 22:12:09, Young Yang (afe.yo...@gmail.com) wrote: Hi, I've encountered some problem when writing install target with cmake. I use `install (TARGETS DESTINATION lib)` to install my shared_library. However, when I run `make install`. It just install the .so to /usr/local/lib and didn't run the ldconfig. I think it is strange and inconvenient to tell the user he should run ldconfig by himself or herself. What is the best way to make the ldconfig run automatically? Thanks in advance :) -- Best wishes, Young Yang -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] [Patch] Two trivial patches fixing type in CPack/DEB testcase
Am 2016-06-16 13:37, schrieb mail6543210--- via cmake-developers: Hi there, Here're two trivial patches for testing of CPack/DEB. One is for building cmake on SELinux-enabled system, and other is for a typo in the same file form the former one. These patches is based on commit 83ae7944 First patch: When building cmake on an SELinux-enabled system, there will be an extra dot at the end of permission field of `ls -l` like this: -rwxrwxrwx. ^ this dot This makes the testing RunCMake.CPack_DEB fail. This patch add an optional dot in the regex to fix it. If it is exactly a dot and not "some random character", than you need to escape that in the regular expression as dot is the wildcard character there. Greetings, Eike -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [Patch] Two trivial patches fixing type in CPack/DEB testcase
Hi there, Here're two trivial patches for testing of CPack/DEB. One is for building cmake on SELinux-enabled system, and other is for a typo in the same file form the former one. These patches is based on commit 83ae7944 First patch: When building cmake on an SELinux-enabled system, there will be an extra dot at the end of permission field of `ls -l` like this: -rwxrwxrwx. ^ this dot This makes the testing RunCMake.CPack_DEB fail. This patch add an optional dot in the regex to fix it. Second patch: Fix typos in testing data. This bug causes two variable undefined. Since "result" MATCHES "${expected_but_undefined_variable}" returns true, this bug has no effect. BR, Patrick From 8e642969249961aa415ba43e85814e962ebc7ef5 Mon Sep 17 00:00:00 2001 From: mail6543210Date: Thu, 16 Jun 2016 17:18:40 +0800 Subject: [PATCH 1/2] Enable building on SELinux-enabled system --- Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake index 5f929ff..ffc795d 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake +++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake @@ -1,17 +1,17 @@ set(foo_preinst "^echo default_preinst$") -set(foo_preinst_permissions_regex "-rwxr-xr-x .*") +set(foo_preinst_permissions_regex "-rwxr-xr-x.? .*") set(foo_prerm "^echo default_prerm$") -set(foo_prerm_permissions_regex "-rwxr-xr-x .*") +set(foo_prerm_permissions_regex "-rwxr-xr-x.? .*") verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm") set(bar_preinst "^echo bar_preinst$") -set(bar_prerm_permissions_regex "-rwx-- .*") +set(bar_prerm_permissions_regex "-rwx--.? .*") set(bar_prerm "^echo bar_prerm$") -set(bar_prerm_permissions_regex "-rwx-- .*") +set(bar_prerm_permissions_regex "-rwx--.? .*") verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm") set(bas_preinst "^echo default_preinst$") -set(bas_prerm_permissions_regex "-rwxr-xr-x .*") +set(bas_prerm_permissions_regex "-rwxr-xr-x.? .*") set(bas_prerm "^echo default_prerm$") -set(bas_prerm_permissions_regex "-rwxr-xr-x .*") +set(bas_prerm_permissions_regex "-rwxr-xr-x.? .*") verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm") -- 1.9.1 From 3bf160c4ea4e88858584435a0fa8c83a5702ff4e Mon Sep 17 00:00:00 2001 From: mail6543210 Date: Thu, 16 Jun 2016 17:29:40 +0800 Subject: [PATCH 2/2] Fix typos of testing data in CPack/DEB --- Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake index ffc795d..1a63e1d 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake +++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake @@ -5,13 +5,13 @@ set(foo_prerm_permissions_regex "-rwxr-xr-x.? .*") verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm") set(bar_preinst "^echo bar_preinst$") -set(bar_prerm_permissions_regex "-rwx--.? .*") +set(bar_preinst_permissions_regex "-rwx--.? .*") set(bar_prerm "^echo bar_prerm$") set(bar_prerm_permissions_regex "-rwx--.? .*") verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm") set(bas_preinst "^echo default_preinst$") -set(bas_prerm_permissions_regex "-rwxr-xr-x.? .*") +set(bas_preinst_permissions_regex "-rwxr-xr-x.? .*") set(bas_prerm "^echo default_prerm$") set(bas_prerm_permissions_regex "-rwxr-xr-x.? .*") verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm") -- 1.9.1 -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[CMake] Target has dependency information when it shouldn't
Hi group. I use CMake 3.3.1 with Visual Studio 2013. I've changed a target from a static library to an INTERFACE library and now I get the following message from CMake: CUSTOMBUILD : CMake error : Target <...> has dependency information when it shouldn't. Your cache is probably stale. Please remove the entry <...>_LIB_DEPENDS If I remove this entry from CMakeCache.txt manually everything works. My question is why can't CMake do it for me as it obviously knows what to do. Thanks, Dvir -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake