[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-208-g0dddf85
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 0dddf85b6d47c38aed2c139209be0d4cb1e2f9f8 (commit) from c705f0af63e2e438d0c6de2400cd90a005576125 (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=0dddf85b6d47c38aed2c139209be0d4cb1e2f9f8 commit 0dddf85b6d47c38aed2c139209be0d4cb1e2f9f8 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Sat Jul 1 00:01:06 2017 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Sat Jul 1 00:01:06 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 182bc31..d2352cd 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 9) -set(CMake_VERSION_PATCH 20170630) +set(CMake_VERSION_PATCH 20170701) #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
Re: [cmake-developers] Built-in tag support for FindDoxygen
On Thu, Jun 29, 2017 at 11:14 AM, Robert Daileywrote: > Doxygen supports linking external documentation together: > https://www.stack.nl/~dimitri/doxygen/manual/external.html > > Using doxygen_add_docs(), it doesn't provide built-in support for tag > files. I'm thinking this would be beneficial since the way the > function is designed encourages modular documentation. At least, I > have my projects structured like this (targets): > > A > A_doxygen > B > B_doxygen > C > C_doxygen > > I have 1 doxygen target per real library target. And each library has > dependencies on others. When library C uses something from A, I want > C_doxygen to link to the tagfile generated by A_doxygen. > > At the moment I'm accomplishing this by adding a target property to > each real target to keep track of target dependencies. Example: > > add_library(C ...) > target_link_libraries(C A) > set_property(TARGET C PROPERTY TARGET_DEPENDENCIES A) > > When I'm building A_doxygen target (using doxygen_add_docs()), I > specify DOXYGEN_GENERATE_TAGFILE. Then in C_doxygen, I specify > DOXYGEN_TAGFILES to point to the one output by A_doxygen. > > I don't like keeping target properties to query the dependency tree, > but this is the best I could come up with. Is there value in > incorporating this into FindDoxygen.cmake? If so, I'd like to > contribute it, if it's useful. > I think there's good potential for this idea. The doxygen_add_docs() function could record the value of the DOXYGEN_GENERATE_TAGFILE variable in a target property (I'd recommend using the same name as the variable). A new DEPENDS option could be added to doxygen_add_docs() which would specify other targets this one depends on. This would invoke add_dependencies() to fulfil build ordering as usual, but it could also inspect the target properties of the dependees and if the DOXYGEN_GENERATE_TAGFILE property is set, then the DOXYGEN_TAGFILES variable could be augmented to pick up that tag file somehow. You'd have to be careful how the paths were handled to ensure they worked robustly, but conceptually at least I think this might be possible and useful. Example usage would then be something like this: # Populate DOXYGEN_GENERATE_TAGFILE if not already set, # use existing contents otherwise. Either way, define a target property # on foo which records the value. doxygen_add_docs(foo) # Does a similar thing as above for this target, but also picks up the # tag file from foo as recorded in its target properties and augments # the DOXYGEN_TAGFILES variable as appropriate. doxygen_add_docs(bar DEPENDS foo) You would need to be careful with how to handle contents of DOXYGEN_GENERATE_TAGFILE and DOXYGEN_TAGFILES that the project might already set. As a conservative measure, you might want to consider adding an option NO_AUTO_TAGFILES or similar to disable any of this logic in case a project does something complex and doxygen_add_docs() needs to be told to leave it completely up to the project to handle. The doxygen_add_docs() function was originally added with the intention of making it as easy as possible for projects to use Doxygen with minimal extra configuration, so I think having the auto tag handling enabled by default would probably be the right call, as long as there's a way for projects to disable it if needed. -- Craig Scott Melbourne, Australia https://crascit.com -- 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] Imported targets not available for Boost version
I have the above error after having to upgrade CMake on my Mac. I have read posts on SO and this list about this issue, stating that it is caused by Boost release being newer than Cmake. However it seems that it is also can be caused by Boost release being older than CMake since this version of Boost worked before I upgraded Cmake. Is any guidance about which versions of CMake work with which versions of Boost? CMake Warning at /usr/local/Cellar/cmake/3.8.2/share/cmake/Modules/FindBoost.cmake:765 (message): Imported targets not available for Boost version Call Stack (most recent call first): /usr/local/Cellar/cmake/3.8.2/share/cmake/Modules/FindBoost.cmake:869 (_Boost_COMPONENT_DEPENDENCIES) /usr/local/Cellar/cmake/3.8.2/share/cmake/Modules/FindBoost.cmake:1472 (_Boost_MISSING_DEPENDENCIES) CMakeLists.txt:142 (find_package) -- Boost fetaures -- not found. set BOOST_ROOT to enable. CMake Warning at CMakeLists.txt:148 (message): Boost is required for command line applications -- 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] Unable to build cmoka project using cmake
Sure Chuck, will try and let you know. Regards Rajesh On Fri, Jun 30, 2017, 11:29 PM Chuck Atkinswrote: > Hi Rajesh, so you're saying it works with 3.8.2 but not with 3.9.x? Can > you try with the recent release candidate, 3.9.0-RC5? It would be helpful > to know the output from what you see on the version that works vs the one > that doesn't since it sounds like a possible regression. > > Thanks. > > -- > Chuck Atkins > Staff R Engineer, Scientific Computing > Kitware, Inc. > > > On Fri, Jun 30, 2017 at 1:17 PM, Rajesh Kumar wrote: > >> Tried with cmake 3.8.2 version. Able to compile CMOCKA. >> >> Regards >> Rajesh >> >> On Wed, Jun 21, 2017, 3:10 PM Rajesh Kumar wrote: >> >>> Hi Al, >>> >>> I am unable to build cmocka project using Cmake. The below are the >>> errors which I'm facing. >>> >>> "The C compiler identification is unknown" >>> "System is unknown to cmake, create: to use this system, please send >>> your config file to cm...@www.cmake.org so it can be added to cmake" >>> >>> Please suggest. >>> >>> Regards >>> Rajesh >>> >> >> -- >> >> 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] Unable to build cmoka project using cmake
Hi Rajesh, so you're saying it works with 3.8.2 but not with 3.9.x? Can you try with the recent release candidate, 3.9.0-RC5? It would be helpful to know the output from what you see on the version that works vs the one that doesn't since it sounds like a possible regression. Thanks. -- Chuck Atkins Staff R Engineer, Scientific Computing Kitware, Inc. On Fri, Jun 30, 2017 at 1:17 PM, Rajesh Kumarwrote: > Tried with cmake 3.8.2 version. Able to compile CMOCKA. > > Regards > Rajesh > > On Wed, Jun 21, 2017, 3:10 PM Rajesh Kumar wrote: > >> Hi Al, >> >> I am unable to build cmocka project using Cmake. The below are the errors >> which I'm facing. >> >> "The C compiler identification is unknown" >> "System is unknown to cmake, create: to use this system, please send your >> config file to cm...@www.cmake.org so it can be added to cmake" >> >> Please suggest. >> >> Regards >> Rajesh >> > > -- > > 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] Unable to build cmoka project using cmake
Tried with cmake 3.8.2 version. Able to compile CMOCKA. Regards Rajesh On Wed, Jun 21, 2017, 3:10 PM Rajesh Kumarwrote: > Hi Al, > > I am unable to build cmocka project using Cmake. The below are the errors > which I'm facing. > > "The C compiler identification is unknown" > "System is unknown to cmake, create: to use this system, please send your > config file to cm...@www.cmake.org so it can be added to cmake" > > Please suggest. > > Regards > Rajesh > -- 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] find_package(), FindXXX.cmake and IMPORTED add_library()
Hi, I'm particularly familiar with find_package() command, add_library(... IMPORTED) and find_library(). However, I found there are many differences on find_package() usage depending of the library being imported. For instance, using find_package() on Qt5 will retrieve a bunch of *Config.cmake files in the Qt installation tree, and add each components as a library using add_library(Qt5::COMPONENT SHARED IMPORTED). One nice feature with that is the possibility to retrieve the LOCATION property on each component to get the DLL file. That said when using find_package(sharedLibFOO) that will make use of hand-written FindsharedLibFOO.cmake, some variables like FindsharedLib_FOUND, FindsharedLib_LIBRARIES, FindsharedLib_VERSION (etc.) are set by the script, but there is almost never add_library() command used inside this CMake find script. 1. Should it be mandatory to use add_library() in FindXXX.cmake scripts, so the user just needs to target_link_libraries() and all compile definitions, includes dir, and lib dir are automatically imported? 2. If not, is it a good practice to use add_library() when writing our FindXXX.cmake package? 3. When making an application, is it a good practice to create an imported target for each library, instead of appending manually to the current project using target_link_libraries(), target_compile_definitions(), target_include_directories() and so on? Thank you for your lights, BR Louis-Paul CORDIER -- 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] hang in FindDoxygen.cmake on ppc64le
I cannot see the hang anymore, most probably a network issue. Pls ignore. Serban Maerean HPC Tools T/L: 293-9770, Tel.: 845-433-9770 E-mail: ser...@us.ibm.com From: Alex TurbovTo: Serban Maerean Cc: cmake@cmake.org Date: 06/29/2017 06:37 AM Subject:Re: [CMake] hang in FindDoxygen.cmake on ppc64le > Linux does not understand '(' in name of files and directories; e.g. actually it does. (and Bash != Linux). Anyway, just like a space symbol, you can quote argument w/ braces: $ mkdir -p '/tmp/Just Test (it)' and everything will be fine. As for the code mentioned, all paths are quoted here, so CMake should see the correct paths here. To get more details please try to run cmake w/ `--trace-expand` and maybe w/ `--trace-source=FindDoxygen.cmake` options. On Mon, Jun 26, 2017 at 7:05 PM, Serban Maerean wrote: Hi, I get a hang in the "file" command in FindDoxygen.cmake, on ppc64le: 103 set(_x86 "(x86)") 104 file(GLOB _Doxygen_GRAPHVIZ_BIN_DIRS 105 "$ENV{ProgramFiles}/Graphviz*/bin" 106 "$ENV{ProgramFiles${_x86}}/Graphviz*/bin" 107 ) 108 unset(_x86) Linux does not understand '(' in name of files and directories; e.g. --> find /ProgramFiles(x86)/Graphviz*/bin -bash: syntax error near unexpected token `(' and it appears the "file" command goes into a wild spin (never returns.) Can this be done only for Windows? I notice some paths are added regardless of platform, even if they are specific to a single platform, which seems to be unecessary. Thanks, Serban Maerean HPC Tools T/L: 293-9770, Tel.: 845-433-9770 E-mail: ser...@us.ibm.com -- 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
[Cmake-commits] CMake branch, release, updated. v3.9.0-rc5-11-gd3234a8
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 d3234a8a48bbb24eff6bb1a0b1750d18c3417792 (commit) via bc92960b63614c4ef9e09a1c063843047190c113 (commit) via 97a9a35607e653ebd5184facc191125e03173ca4 (commit) via c2a6df94ed639de2192c8baf2350efb2a4fd9c50 (commit) from 594b0f80a8e943f9c2a0920b56f3c69b0553b92a (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/FindDoxygen.cmake | 10 +- Source/cmGlobalXCodeGenerator.cxx |8 Source/cmGlobalXCodeGenerator.h |2 +- 3 files changed, 10 insertions(+), 10 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.9.0-rc5-207-gc705f0a
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 c705f0af63e2e438d0c6de2400cd90a005576125 (commit) via d3234a8a48bbb24eff6bb1a0b1750d18c3417792 (commit) via bc92960b63614c4ef9e09a1c063843047190c113 (commit) from b6cbbbe129fd12e7ac39e1589e448fd86031 (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=c705f0af63e2e438d0c6de2400cd90a005576125 commit c705f0af63e2e438d0c6de2400cd90a005576125 Merge: b6cbbbe d3234a8 Author: Brad KingAuthorDate: Fri Jun 30 10:51:16 2017 -0400 Commit: Brad King CommitDate: Fri Jun 30 10:51:16 2017 -0400 Merge branch 'release-3.9' --- 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.9.0-rc5-204-gb6cbbbe
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 b6cbbbe129fd12e7ac39e1589e448fd86031 (commit) via 15c5d9a0dd6961f908ffd30bc32471905a3d2bda (commit) via ab533e4851b1a9ac862af353e5013650f35360bf (commit) via c2a6df94ed639de2192c8baf2350efb2a4fd9c50 (commit) from bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 (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=b6cbbbe129fd12e7ac39e1589e448fd86031 commit b6cbbbe129fd12e7ac39e1589e448fd86031 Merge: 15c5d9a ab533e4 Author: Brad KingAuthorDate: Fri Jun 30 14:32:18 2017 + Commit: Kitware Robot CommitDate: Fri Jun 30 10:32:22 2017 -0400 Merge topic 'server-mode-protocol-version-docs' ab533e48 Help: Document server-mode protocol versions more clearly Acked-by: Kitware Robot Merge-request: !1015 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15c5d9a0dd6961f908ffd30bc32471905a3d2bda commit 15c5d9a0dd6961f908ffd30bc32471905a3d2bda Merge: bcca01d c2a6df9 Author: Brad King AuthorDate: Fri Jun 30 14:31:51 2017 + Commit: Kitware Robot CommitDate: Fri Jun 30 10:32:02 2017 -0400 Merge topic 'xcode-cross-sdk-object-libraries' c2a6df94 Xcode: Use correct Object Library paths for cross-SDK builds Acked-by: Kitware Robot Merge-request: !1016 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab533e4851b1a9ac862af353e5013650f35360bf commit ab533e4851b1a9ac862af353e5013650f35360bf Author: Tobias Hunger AuthorDate: Thu Jun 29 10:29:19 2017 +0200 Commit: Brad King CommitDate: Thu Jun 29 09:58:49 2017 -0400 Help: Document server-mode protocol versions more clearly diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst index 9520cc1..6a68a1c 100644 --- a/Help/manual/cmake-server.7.rst +++ b/Help/manual/cmake-server.7.rst @@ -254,6 +254,11 @@ versions supported by the cmake server. These are JSON objects with "major" and as experimental. These will contain the "isExperimental" key set to true. Enabling these requires a special command line argument when starting the cmake server mode. +Within a "major" version all "minor" versions are fully backwards compatible. +New "minor" versions may introduce functionality in such a way that existing +clients of the same "major" version will continue to work, provided they +ignore keys in the output that they do not know about. + Example:: [== "CMake Server" ==[ @@ -268,6 +273,9 @@ The first request that the client may send to the server is of type "handshake". This request needs to pass one of the "supportedProtocolVersions" of the "hello" type response received earlier back to the server in the "protocolVersion" field. +Giving the "major" version of the requested protocol version will make the server +use the latest minor version of that protocol. Use this if you do not explicitly +need to depend on a specific minor version. Each protocol version may request additional attributes to be present. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2a6df94ed639de2192c8baf2350efb2a4fd9c50 commit c2a6df94ed639de2192c8baf2350efb2a4fd9c50 Author: Gregor Jasny AuthorDate: Thu Jun 29 14:19:23 2017 +0200 Commit: Brad King CommitDate: Thu Jun 29 09:52:44 2017 -0400 Xcode: Use correct Object Library paths for cross-SDK builds When calculating Object Library paths take a look at the `XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` property to enable builds with different SDKs. Otherwise a hard-coded architecture could be chosen. Fixes: #16040 diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 45c1764..9037961 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -147,7 +147,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator( this->XcodeBuildCommandInitialized = false; this->ObjectDirArchDefault = "$(CURRENT_ARCH)"; - this->ComputeObjectDirArch(); + this->ObjectDirArch = this->ObjectDirArchDefault; cm->GetState()->SetIsGeneratorMultiConfig(true); } @@ -3087,12 +3087,12 @@ void cmGlobalXCodeGenerator::ComputeArchitectures(cmMakefile* mf) } } - this->ComputeObjectDirArch(); + this->ComputeObjectDirArch(mf); } -void cmGlobalXCodeGenerator::ComputeObjectDirArch() +void
[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-200-gbcca01d
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 bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 (commit) via 97a9a35607e653ebd5184facc191125e03173ca4 (commit) from db96ebaa7bc5366aa5790307b682aa8548c2bba2 (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=bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 commit bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 Merge: db96eba 97a9a35 Author: Brad KingAuthorDate: Fri Jun 30 14:17:11 2017 + Commit: Kitware Robot CommitDate: Fri Jun 30 10:17:29 2017 -0400 Merge topic 'FindDoxygen-project-in-subdir' 97a9a356 FindDoxygen: Use a stable reference to the location of global resources Acked-by: Kitware Robot Merge-request: !1014 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97a9a35607e653ebd5184facc191125e03173ca4 commit 97a9a35607e653ebd5184facc191125e03173ca4 Author: Robert Dailey AuthorDate: Wed Jun 28 16:02:57 2017 -0500 Commit: Robert Dailey CommitDate: Thu Jun 29 13:39:26 2017 -0500 FindDoxygen: Use a stable reference to the location of global resources FindDoxygen generates some files based on the version of Doxygen whose content will not vary across a project and are therefore a global resource that can be shared by all calls to `find_package(Doxygen)` and to `doxygen_add_docs`. We currently use `${PROJECT_BINARY_DIR}` to reference their location, but this is not stable because `project()` calls in a subdirectory can change it. Use `${CMAKE_BINARY_DIR}` instead. Reviewed-by: Craig Scott Fixes: #17022 diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 26d44b9..fb16f20 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -619,7 +619,7 @@ if(TARGET Doxygen::doxygen) # If doxygen was found, use it to generate a minimal default Doxyfile. # We will delete this file after we have finished using it below to # generate the other files that doxygen_add_docs() will use. -set(_Doxygen_tpl "${PROJECT_BINARY_DIR}/CMakeDoxyfile.tpl") +set(_Doxygen_tpl "${CMAKE_BINARY_DIR}/CMakeDoxyfile.tpl") execute_process( COMMAND "${DOXYGEN_EXECUTABLE}" -s -g "${_Doxygen_tpl}" OUTPUT_QUIET @@ -646,8 +646,8 @@ if(TARGET Doxygen::doxygen) # content is only dependent on the version of Doxygen being used. Therefore # we always put them at the top of the build tree so that they are in a # predictable location. -set(_doxyfile_in "${PROJECT_BINARY_DIR}/CMakeDoxyfile.in") -set(_doxyfile_defaults "${PROJECT_BINARY_DIR}/CMakeDoxygenDefaults.cmake") +set(_doxyfile_in "${CMAKE_BINARY_DIR}/CMakeDoxyfile.in") +set(_doxyfile_defaults "${CMAKE_BINARY_DIR}/CMakeDoxygenDefaults.cmake") file(WRITE "${_doxyfile_in}" ${_Doxygen_dne_header}) file(WRITE "${_doxyfile_defaults}" ${_Doxygen_dne_header}) @@ -896,7 +896,7 @@ doxygen_add_docs() for target ${targetName}") # Now bring in Doxgen's defaults for those things the project has not # already set and we have not provided above -include("${PROJECT_BINARY_DIR}/CMakeDoxygenDefaults.cmake" OPTIONAL) +include("${CMAKE_BINARY_DIR}/CMakeDoxygenDefaults.cmake" OPTIONAL) # Cleanup built HTMLs on "make clean" # TODO Any other dirs? @@ -1025,7 +1025,7 @@ doxygen_add_docs() for target ${targetName}") endforeach() # Prepare doxygen configuration file -set(_doxyfile_template "${PROJECT_BINARY_DIR}/CMakeDoxyfile.in") +set(_doxyfile_template "${CMAKE_BINARY_DIR}/CMakeDoxyfile.in") set(_target_doxyfile "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.${targetName}") configure_file("${_doxyfile_template}" "${_target_doxyfile}") --- Summary of changes: Modules/FindDoxygen.cmake | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits