[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-405-g07226324eb
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 07226324ebd179a22cf581f31be07b71ab160ce6 (commit) from 52accc779efe350cb9778005a1fb4aeb9b090456 (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=07226324ebd179a22cf581f31be07b71ab160ce6 commit 07226324ebd179a22cf581f31be07b71ab160ce6 Author: Kitware Robot AuthorDate: Fri Nov 22 00:01:10 2019 -0500 Commit: Kitware Robot CommitDate: Fri Nov 22 00:01:10 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 76ef7d3988..3f65c674a4 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191121) +set(CMake_VERSION_PATCH 20191122) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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 https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-404-g52accc779e
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 52accc779efe350cb9778005a1fb4aeb9b090456 (commit) via 51d83d4955bd22c018ff99299a224ba94452 (commit) via 602f2118b083f998cd7523efcdd5f39689eb15ac (commit) via 1e68fb0c91dd3f4fa64053601e878b1ffde1b439 (commit) from ad815939c9b3f604c68a636c88f4842e1ab22129 (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=52accc779efe350cb9778005a1fb4aeb9b090456 commit 52accc779efe350cb9778005a1fb4aeb9b090456 Merge: 51d83d4955 602f2118b0 Author: Brad King AuthorDate: Thu Nov 21 16:27:18 2019 + Commit: Kitware Robot CommitDate: Thu Nov 21 11:27:26 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51d83d4955bd22c018ff99299a224ba94452 commit 51d83d4955bd22c018ff99299a224ba94452 Merge: ad815939c9 1e68fb0c91 Author: Brad King AuthorDate: Thu Nov 21 16:27:18 2019 + Commit: Kitware Robot CommitDate: Thu Nov 21 11:27:25 2019 -0500 Merge topic 'xcode-objc' 1e68fb0c91 Xcode: Set source file type for Objective C/C++ Acked-by: Kitware Robot Merge-request: !4073 --- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 4 1 file changed, 4 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc4-4-g602f2118b0
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 602f2118b083f998cd7523efcdd5f39689eb15ac (commit) via 1e68fb0c91dd3f4fa64053601e878b1ffde1b439 (commit) from 2a2c890023c7cfc643d8390a07bffe7676556b32 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 4 1 file changed, 4 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-400-gad815939c9
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 ad815939c9b3f604c68a636c88f4842e1ab22129 (commit)
via 0b14c3fded9c5e7c67c261949dc37d79d8236830 (commit)
via 96820562c6ae7041b447d8d60a3bf5ea6b7a6ecc (commit)
via d2f859f1510c334403b948481f78e56731a29eac (commit)
via ae7d99fbd51e31e012f1434ebe7ba16ea1bef060 (commit)
via 8d47b97a695111d2718c9f7a7729516e3a18e15e (commit)
via 1b27ac78ac80a0edeaa90038a15b6ac985a29880 (commit)
via c7a4b1a58efd3b7ef8794547dcee738e8fd1b483 (commit)
via e221039e11fb4961b8cbbdbd2fd8f1af99534893 (commit)
via 46de38dae2c43c0dc2dd24307a0615a11a881e39 (commit)
via 5e9ecaae0e191aba8b02243cb94a68983d6ce3f0 (commit)
via b4ef7fbaa8257254abba0d7847941baf78fdb6ed (commit)
from d9cf0ec4d4a942aec3360d66855379f7360ab00d (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=ad815939c9b3f604c68a636c88f4842e1ab22129
commit ad815939c9b3f604c68a636c88f4842e1ab22129
Merge: 0b14c3fded b4ef7fbaa8
Author: Brad King
AuthorDate: Thu Nov 21 16:10:23 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:10:34 2019 -0500
Merge topic 'ccmake_fix_help_text_crash'
b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the
window
Acked-by: Kitware Robot
Merge-request: !4062
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b14c3fded9c5e7c67c261949dc37d79d8236830
commit 0b14c3fded9c5e7c67c261949dc37d79d8236830
Merge: 96820562c6 e221039e11
Author: Brad King
AuthorDate: Thu Nov 21 16:05:26 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:05:52 2019 -0500
Merge topic 'FindMPI-improve-error'
e221039e11 FindMPI: Improve error when a component's language is not enabled
Acked-by: Kitware Robot
Acked-by: Ben Boeckel
Merge-request: !4071
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96820562c6ae7041b447d8d60a3bf5ea6b7a6ecc
commit 96820562c6ae7041b447d8d60a3bf5ea6b7a6ecc
Merge: d2f859f151 8d47b97a69
Author: Brad King
AuthorDate: Thu Nov 21 16:04:48 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:05:03 2019 -0500
Merge topic 'UseJava-javadoc-classpath-separator'
8d47b97a69 UseJava: Use correct path separator in javadoc
1b27ac78ac UseJava: Use list(APPEND) to simplify javadoc option construction
c7a4b1a58e UseJava: Extract the path separator to module level
Acked-by: Kitware Robot
Merge-request: !3967
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2f859f1510c334403b948481f78e56731a29eac
commit d2f859f1510c334403b948481f78e56731a29eac
Merge: ae7d99fbd5 46de38dae2
Author: Brad King
AuthorDate: Thu Nov 21 16:03:46 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:04:03 2019 -0500
Merge topic 'ExternalProject-list-sep-in-cache'
46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files
too
Acked-by: Kitware Robot
Merge-request: !4070
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae7d99fbd51e31e012f1434ebe7ba16ea1bef060
commit ae7d99fbd51e31e012f1434ebe7ba16ea1bef060
Merge: d9cf0ec4d4 5e9ecaae0e
Author: Brad King
AuthorDate: Thu Nov 21 16:02:58 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:03:09 2019 -0500
Merge topic 'load_cache_in_script'
5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts
Acked-by: Kitware Robot
Merge-request: !4042
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d47b97a695111d2718c9f7a7729516e3a18e15e
commit 8d47b97a695111d2718c9f7a7729516e3a18e15e
Author: Nathan Burles
AuthorDate: Mon Nov 4 10:40:42 2019 +
Commit: Brad King
CommitDate: Wed Nov 20 10:38:44 2019 -0500
UseJava: Use correct path separator in javadoc
For both classpath and sourcepath.
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 27f1218bbf..28f74ea6ed 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -1190,29 +1190,13 @@ function(create_javadoc _target)
set(_javadoc_options -d ${_javadoc_builddir})
if (_javadoc_sourcepath)
-set(_start TRUE)
-foreach(_path IN LISTS _javadoc_sourcepath)
-if (_start)
-set(_sourcepath ${_path})
-set(_start FALSE)
-else ()
-set(_sourcepath ${_sourcepath}:${_path})
-endif ()
-endforeach()
-list(APPEND _javadoc_options -sourcepath ${_sourcepath})
+list(JOIN _javadoc_sourcepath "${_UseJava_PATH_SEP}"
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-388-gd9cf0ec4d4
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 d9cf0ec4d4a942aec3360d66855379f7360ab00d (commit)
via 95387dbf6070bf1da9e69ee92b7104130ef290df (commit)
via 905b7759adaaa6deca51186faa19beec2790e24e (commit)
via 2a2c890023c7cfc643d8390a07bffe7676556b32 (commit)
via 84408ff4025b59f268e07bc368e97fe07252be2c (commit)
via 51c69fe5f88ea8ed262665b953f1202668ba9cf8 (commit)
from 0fff8d653c38e20d9b7a4c026b66f45f8078cb41 (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=d9cf0ec4d4a942aec3360d66855379f7360ab00d
commit d9cf0ec4d4a942aec3360d66855379f7360ab00d
Merge: 95387dbf60 51c69fe5f8
Author: Brad King
AuthorDate: Thu Nov 21 16:01:52 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:02:00 2019 -0500
Merge topic 'fileapi-multi-config'
51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file
Acked-by: Kitware Robot
Acked-by: Brad King
Merge-request: !4072
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95387dbf6070bf1da9e69ee92b7104130ef290df
commit 95387dbf6070bf1da9e69ee92b7104130ef290df
Merge: 905b7759ad 2a2c890023
Author: Brad King
AuthorDate: Thu Nov 21 16:00:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:00:34 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=905b7759adaaa6deca51186faa19beec2790e24e
commit 905b7759adaaa6deca51186faa19beec2790e24e
Merge: 0fff8d653c 84408ff402
Author: Brad King
AuthorDate: Thu Nov 21 16:00:25 2019 +
Commit: Kitware Robot
CommitDate: Thu Nov 21 11:00:33 2019 -0500
Merge topic 'FindwxWidgets-qt-debug'
84408ff402 FindwxWidgets: Find wxQt debug libraries
Acked-by: Kitware Robot
Merge-request: !4069
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51c69fe5f88ea8ed262665b953f1202668ba9cf8
commit 51c69fe5f88ea8ed262665b953f1202668ba9cf8
Author: Kyle Edwards
AuthorDate: Wed Nov 20 09:44:28 2019 -0500
Commit: Kyle Edwards
CommitDate: Wed Nov 20 09:46:10 2019 -0500
FileAPI: Add "multiConfig" parameter to index file
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index 04b6ed2598..12eecd9932 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -199,6 +199,7 @@ The reply index file contains a JSON object:
"root": "/prefix/share/cmake-3.14"
},
"generator": {
+"multiConfig": false,
"name": "Unix Makefiles"
}
},
@@ -267,6 +268,9 @@ The members are:
A JSON object describing the CMake generator used for the build.
It has members:
+``multiConfig``
+ A boolean specifying whether the generator supports multiple output
+ configurations.
``name``
A string specifying the name of the generator.
``platform``
diff --git a/Help/release/dev/fileapi-multi-config.rst
b/Help/release/dev/fileapi-multi-config.rst
new file mode 100644
index 00..e0e2e16a52
--- /dev/null
+++ b/Help/release/dev/fileapi-multi-config.rst
@@ -0,0 +1,6 @@
+fileapi-multi-config
+
+
+* The :manual:`file API ` index file now emits a
+ ``multiConfig`` flag specifying whether or not the generator supports
+ multiple output configurations.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d903289e4b..e38066fc8d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -124,6 +124,7 @@ Json::Value cmGlobalGenerator::GetJson() const
{
Json::Value generator = Json::objectValue;
generator["name"] = this->GetName();
+ generator["multiConfig"] = this->IsMultiConfig();
return generator;
}
#endif
diff --git a/Tests/RunCMake/FileAPI/check_index.py
b/Tests/RunCMake/FileAPI/check_index.py
index cda72341cb..23b02e908a 100644
--- a/Tests/RunCMake/FileAPI/check_index.py
+++ b/Tests/RunCMake/FileAPI/check_index.py
@@ -109,10 +109,11 @@ def check_cmake_generator(g):
name = g.get("name", None)
assert is_string(name)
if name.startswith("Visual Studio"):
-assert sorted(g.keys()) == ["name", "platform"]
+assert sorted(g.keys()) == ["multiConfig", "name", "platform"]
assert is_string(g["platform"])
else:
-assert sorted(g.keys()) == ["name"]
+assert sorted(g.keys()) == ["multiConfig", "name"]
+assert is_bool(g["multiConfig"], matches(name, "^(Visual Studio |Xcode$)"))
def check_index_object(indexEntry, kind, major, minor, check):
assert is_dict(indexEntry)
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc4-2-g2a2c890023
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 2a2c890023c7cfc643d8390a07bffe7676556b32 (commit) via 84408ff4025b59f268e07bc368e97fe07252be2c (commit) from d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Modules/FindwxWidgets.cmake | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
Re: [CMake] Missing dll on program startup - a way automate it?
Can also add install rules so you get an INSTALL target, and then you can just build that, and everything will end up in the right place. On Thu, Nov 21, 2019 at 3:56 AM Fred Baksik wrote: > Adding the relevant directories to PATH in the debugger or build > environment should allow them to be found. > > On Wed, Nov 20, 2019, at 3:32 AM, Petr Kmoch wrote: > > Hi. > > I haven't used it yet, but I believe the target property > https://cmake.org/cmake/help/latest/prop_tgt/VS_DEBUGGER_ENVIRONMENT.html > might help you. > > Petr > > On Wed, 20 Nov 2019 at 01:02, cen wrote: > > Hi > > Perhaps not really a cmake problem but here we go. An exe depends on a > few DLLs which I ship in the repo so the rest of the devs don't have to > build them or fetch them somewhere else. Cmake finds the libraries and > project builds just fine, until you run it from VS.. you are welcomed by > the "missing dll" windows error. So I have to copy all the dlls to the > build/run folder to make it work but this is a manual step. Is there > some way in cmake/VS to somehow tell the IDE to append the execution > $PATH with all the specified library dependencies or something along > those lines? Ideally my goal is to just run cmake, open VS, build the > project and run, all automagical. > > I would prefer to keep the dynamic linking. > > > Best regards, cen > > -- > > Powered by kitware.com/cmake > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit https://cmake.org/services > > Visit other Kitware open-source projects at > https://www.kitware.com/platforms > > Follow this link to subscribe/unsubscribe: > https://cmake.org/mailman/listinfo/cmake > > This mailing list is deprecated in favor of https://discourse.cmake.org > > -- > > Powered by kitware.com/cmake > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit https://cmake.org/services > > Visit other Kitware open-source projects at > https://www.kitware.com/platforms > > Follow this link to subscribe/unsubscribe: > https://cmake.org/mailman/listinfo/cmake > > This mailing list is deprecated in favor of https://discourse.cmake.org > > > -- > > Powered by kitware.com/cmake > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit https://cmake.org/services > > Visit other Kitware open-source projects at > https://www.kitware.com/platforms > > Follow this link to subscribe/unsubscribe: > https://cmake.org/mailman/listinfo/cmake > > This mailing list is deprecated in favor of https://discourse.cmake.org > -- Powered by kitware.com/cmake Kitware offers various services to support the CMake community. For more information on each offering, please visit https://cmake.org/services Visit other Kitware open-source projects at https://www.kitware.com/platforms Follow this link to subscribe/unsubscribe: https://cmake.org/mailman/listinfo/cmake This mailing list is deprecated in favor of https://discourse.cmake.org
Re: [CMake] Missing dll on program startup - a way automate it?
Adding the relevant directories to PATH in the debugger or build environment should allow them to be found. On Wed, Nov 20, 2019, at 3:32 AM, Petr Kmoch wrote: > Hi. > > I haven't used it yet, but I believe the target property > https://cmake.org/cmake/help/latest/prop_tgt/VS_DEBUGGER_ENVIRONMENT.html > might help you. > > Petr > > On Wed, 20 Nov 2019 at 01:02, cen wrote: >> Hi >> >> Perhaps not really a cmake problem but here we go. An exe depends on a >> few DLLs which I ship in the repo so the rest of the devs don't have to >> build them or fetch them somewhere else. Cmake finds the libraries and >> project builds just fine, until you run it from VS.. you are welcomed by >> the "missing dll" windows error. So I have to copy all the dlls to the >> build/run folder to make it work but this is a manual step. Is there >> some way in cmake/VS to somehow tell the IDE to append the execution >> $PATH with all the specified library dependencies or something along >> those lines? Ideally my goal is to just run cmake, open VS, build the >> project and run, all automagical. >> >> I would prefer to keep the dynamic linking. >> >> >> Best regards, cen >> >> -- >> >> Powered by kitware.com/cmake >> >> Kitware offers various services to support the CMake community. For more >> information on each offering, please visit https://cmake.org/services >> >> Visit other Kitware open-source projects at >> https://www.kitware.com/platforms >> >> Follow this link to subscribe/unsubscribe: >> https://cmake.org/mailman/listinfo/cmake >> >> This mailing list is deprecated in favor of https://discourse.cmake.org > -- > > Powered by kitware.com/cmake > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit https://cmake.org/services > > Visit other Kitware open-source projects at https://www.kitware.com/platforms > > Follow this link to subscribe/unsubscribe: > https://cmake.org/mailman/listinfo/cmake > > This mailing list is deprecated in favor of https://discourse.cmake.org > -- Powered by kitware.com/cmake Kitware offers various services to support the CMake community. For more information on each offering, please visit https://cmake.org/services Visit other Kitware open-source projects at https://www.kitware.com/platforms Follow this link to subscribe/unsubscribe: https://cmake.org/mailman/listinfo/cmake This mailing list is deprecated in favor of https://discourse.cmake.org
