[Cmake-commits] CMake branch, master, updated. v3.11.0-339-g08b49c2
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 08b49c277daa5e833a2ff4673c8dd1ab003eb8d9 (commit) from 98f23da8dfe4d6bb90225de83476b6a958c3e284 (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=08b49c277daa5e833a2ff4673c8dd1ab003eb8d9 commit 08b49c277daa5e833a2ff4673c8dd1ab003eb8d9 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Thu Mar 29 00:01:07 2018 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Thu Mar 29 00:01:07 2018 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index cfb3b73..99a1b56 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 11) -set(CMake_VERSION_PATCH 20180328) +set(CMake_VERSION_PATCH 20180329) #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 https://cmake.org/mailman/listinfo/cmake-commits
Re: [CMake] find_library fails when cross compiling
In case anyone else hits this, I figured it out. The issue was that our toolchain file specified "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY" which meant it was ignoring our PATH list. Changing it to "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH" solved the issue. On Mon, Mar 26, 2018 at 6:06 PM Oliver Dainwrote: > Hi, > > I have some find_library lines like the following: > > find_library(protobuf_protobuf protobuf PATHS > /Users/oliverdain/Documents/code/revl/.install/${ARCH}/${VARIANT}/protobuf/3.4.1.r1/lib > NO_DEFAULT_PATH ) > target_link_libraries(ml_editing PUBLIC ${protobuf_protobuf}) > > These work find when $ARCH and $VARIANT are set to OSX and either Debug or > Release (my target system). However, If I run > > cmake -H. > -B/Users/oliverdain/Documents/code/revl/cpp/build/build/IPHONE/Release > -DCMAKE_TOOLCHAIN_FILE=ios.toolchain.cmake -DIOS_PLATFORM=OS > -DCMAKE_BUILD_TYPE=Release -DARCH=IPHONE -DVARIANT=Release > > the libraries are reported not found (the standard "CMake Error: The > following variables are used in this project, but they are set to > NOTFOUND." error) even though the libraries are in the specified location. > For example, it says it can't find the protobuf libs but an ls yields: > > $ ls > /Users/oliverdain/Documents/code/revl/.install/IPHONE/Release/protobuf/3.4.1.r1/lib > cmake libprotobuf-lite.a libprotobuf.a pkgconfig > > Note that if I change the NO_DEFAULT_PATH specification in the > find_library line to NO_CMAKE_FIND_ROOT_PATH everything works as expected > and the libs are found and linked (and I know its the right libs because > things also run). > > Is this a bug or is there something I don't understand about > NO_DEFAULT_PATH? > > Thanks, > Oliver > > PS: I know the hard coded full path names are odd - the CMakeLists.txt > files are actually generated -- it's a long story. > -- 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: https://cmake.org/mailman/listinfo/cmake
[CMake] [ANNOUNCE] CMake 3.11.0 available for download
I am proud to announce that CMake 3.11.0 is now available for download at: https://cmake.org/download/ Documentation is available at: https://cmake.org/cmake/help/v3.11 Release notes appear below and are also published at https://cmake.org/cmake/help/v3.11/release/3.11.html Some of the more significant changes in CMake 3.11 are: * The Makefile Generators and the "Ninja" generator learned to add compiler launcher tools along with the compiler for the "Fortran" language ("C", "CXX", and "CUDA" were supported previously). See the "CMAKE__COMPILER_LAUNCHER" variable and "_COMPILER_LAUNCHER" target property for details. * Visual Studio Generators learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS", "INCLUDE_DIRECTORIES", "COMPILE_OPTIONS", and "file(GENERATE)". See generator expression documentation for caveats. * The "Xcode" Generator learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS" and "INCLUDE_DIRECTORIES". It previously supported only "COMPILE_OPTIONS" and "file(GENERATE)". See generator expression documentation for caveats. * "add_library()" and "add_executable()" commands can now be called without any sources and will not complain as long as sources are added later via the "target_sources()" command. * The "target_compile_definitions()" command learned to set the "INTERFACE_COMPILE_DEFINITIONS" property on Imported Targets. * The "target_compile_features()" command learned to set the "INTERFACE_COMPILE_FEATURES" property on Imported Targets. * The "target_compile_options()" command learned to set the "INTERFACE_COMPILE_OPTIONS" property on Imported Targets. * The "target_include_directories()" command learned to set the "INTERFACE_INCLUDE_DIRECTORIES" property on Imported Targets. * The "target_sources()" command learned to set the "INTERFACE_SOURCES" property on Imported Targets. * The "target_link_libraries()" command learned to set the "INTERFACE_LINK_LIBRARIES" property on Imported Targets. * The "COMPILE_DEFINITIONS" source file property learned to support "generator expressions". * A "COMPILE_OPTIONS" source file property was added to manage list of options to pass to the compiler. * When using "AUTOMOC" or "AUTOUIC", CMake now starts multiple parallel "moc" or "uic" processes to reduce the build time. A new "CMAKE_AUTOGEN_PARALLEL" variable and "AUTOGEN_PARALLEL" target property may be set to specify the number of parallel "moc" or "uic" processes to start. The default is derived from the number of CPUs on the host. CMake 3.11 Release Notes Changes made since CMake 3.10 include the following. New Features Platforms - * TI C/C++ compilers are now supported by the "Ninja" generator. Generators -- * The "CodeBlocks" extra generator learned to check a "CMAKE_CODEBLOCKS_COMPILER_ID" variable for a custom compiler identification value to place in the project file. * The Makefile Generators and the "Ninja" generator learned to add compiler launcher tools along with the compiler for the "Fortran" language ("C", "CXX", and "CUDA" were supported previously). See the "CMAKE__COMPILER_LAUNCHER" variable and "_COMPILER_LAUNCHER" target property for details. * Visual Studio Generators learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS", "INCLUDE_DIRECTORIES", "COMPILE_OPTIONS", and "file(GENERATE)". See generator expression documentation for caveats. * The "Xcode" generator learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS" and "INCLUDE_DIRECTORIES". It previously supported only "COMPILE_OPTIONS" and "file(GENERATE)". See generator expression documentation for caveats. Commands * "add_library()" and "add_executable()" commands can now be called without any sources and will not complain as long as sources are added later via the "target_sources()" command. * The "file(DOWNLOAD)" and "file(UPLOAD)" commands gained "NETRC" and "NETRC_FILE" options to specify use of a ".netrc" file. * The "target_compile_definitions()" command learned to set the "INTERFACE_COMPILE_DEFINITIONS" property on Imported Targets. * The "target_compile_features()" command learned to set the "INTERFACE_COMPILE_FEATURES" property on Imported Targets. * The "target_compile_options()" command learned to set the "INTERFACE_COMPILE_OPTIONS" property on Imported Targets. * The "target_include_directories()" command learned to set the "INTERFACE_INCLUDE_DIRECTORIES" property on Imported Targets. * The "target_sources()" command learned to set the "INTERFACE_SOURCES" property on Imported Targets. * The "target_link_libraries()" command learned to set the "INTERFACE_LINK_LIBRARIES" property on Imported Targets. Variables - * A
[cmake-developers] [ANNOUNCE] CMake 3.11.0 available for download
I am proud to announce that CMake 3.11.0 is now available for download at: https://cmake.org/download/ Documentation is available at: https://cmake.org/cmake/help/v3.11 Release notes appear below and are also published at https://cmake.org/cmake/help/v3.11/release/3.11.html Some of the more significant changes in CMake 3.11 are: * The Makefile Generators and the "Ninja" generator learned to add compiler launcher tools along with the compiler for the "Fortran" language ("C", "CXX", and "CUDA" were supported previously). See the "CMAKE__COMPILER_LAUNCHER" variable and "_COMPILER_LAUNCHER" target property for details. * Visual Studio Generators learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS", "INCLUDE_DIRECTORIES", "COMPILE_OPTIONS", and "file(GENERATE)". See generator expression documentation for caveats. * The "Xcode" Generator learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS" and "INCLUDE_DIRECTORIES". It previously supported only "COMPILE_OPTIONS" and "file(GENERATE)". See generator expression documentation for caveats. * "add_library()" and "add_executable()" commands can now be called without any sources and will not complain as long as sources are added later via the "target_sources()" command. * The "target_compile_definitions()" command learned to set the "INTERFACE_COMPILE_DEFINITIONS" property on Imported Targets. * The "target_compile_features()" command learned to set the "INTERFACE_COMPILE_FEATURES" property on Imported Targets. * The "target_compile_options()" command learned to set the "INTERFACE_COMPILE_OPTIONS" property on Imported Targets. * The "target_include_directories()" command learned to set the "INTERFACE_INCLUDE_DIRECTORIES" property on Imported Targets. * The "target_sources()" command learned to set the "INTERFACE_SOURCES" property on Imported Targets. * The "target_link_libraries()" command learned to set the "INTERFACE_LINK_LIBRARIES" property on Imported Targets. * The "COMPILE_DEFINITIONS" source file property learned to support "generator expressions". * A "COMPILE_OPTIONS" source file property was added to manage list of options to pass to the compiler. * When using "AUTOMOC" or "AUTOUIC", CMake now starts multiple parallel "moc" or "uic" processes to reduce the build time. A new "CMAKE_AUTOGEN_PARALLEL" variable and "AUTOGEN_PARALLEL" target property may be set to specify the number of parallel "moc" or "uic" processes to start. The default is derived from the number of CPUs on the host. CMake 3.11 Release Notes Changes made since CMake 3.10 include the following. New Features Platforms - * TI C/C++ compilers are now supported by the "Ninja" generator. Generators -- * The "CodeBlocks" extra generator learned to check a "CMAKE_CODEBLOCKS_COMPILER_ID" variable for a custom compiler identification value to place in the project file. * The Makefile Generators and the "Ninja" generator learned to add compiler launcher tools along with the compiler for the "Fortran" language ("C", "CXX", and "CUDA" were supported previously). See the "CMAKE__COMPILER_LAUNCHER" variable and "_COMPILER_LAUNCHER" target property for details. * Visual Studio Generators learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS", "INCLUDE_DIRECTORIES", "COMPILE_OPTIONS", and "file(GENERATE)". See generator expression documentation for caveats. * The "Xcode" generator learned to support the "COMPILE_LANGUAGE" "generator expression" in target-wide "COMPILE_DEFINITIONS" and "INCLUDE_DIRECTORIES". It previously supported only "COMPILE_OPTIONS" and "file(GENERATE)". See generator expression documentation for caveats. Commands * "add_library()" and "add_executable()" commands can now be called without any sources and will not complain as long as sources are added later via the "target_sources()" command. * The "file(DOWNLOAD)" and "file(UPLOAD)" commands gained "NETRC" and "NETRC_FILE" options to specify use of a ".netrc" file. * The "target_compile_definitions()" command learned to set the "INTERFACE_COMPILE_DEFINITIONS" property on Imported Targets. * The "target_compile_features()" command learned to set the "INTERFACE_COMPILE_FEATURES" property on Imported Targets. * The "target_compile_options()" command learned to set the "INTERFACE_COMPILE_OPTIONS" property on Imported Targets. * The "target_include_directories()" command learned to set the "INTERFACE_INCLUDE_DIRECTORIES" property on Imported Targets. * The "target_sources()" command learned to set the "INTERFACE_SOURCES" property on Imported Targets. * The "target_link_libraries()" command learned to set the "INTERFACE_LINK_LIBRARIES" property on Imported Targets. Variables - * A
[CMake] cmake build issue with symlinks and dependencies
I'm trying to build libvnc, and I have run into this when building other source code as well. For some reason cmake errors out when checking the dependency of a symlinked file, after executing 'cmake --build .'. I'm not sure I'm even describing that properly. It's best understood by looking at the below. This is the relevant section of the build.make file. libvncclient.so.0.9.12: CMakeFiles/vncclient.dir/link.txt @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/bsferrazza/lfs/sources/libvncserver/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Linking C shared library libvncclient.so" $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/vncclient.dir/link.txt --verbose=$(VERBOSE) $(CMAKE_COMMAND) -E cmake_symlink_library libvncclient.so.0.9.12 libvncclient.so.1 libvncclient.so libvncclient.so.1: libvncclient.so.0.9.12 @$(CMAKE_COMMAND) -E touch_nocreate libvncclient.so.1 libvncclient.so: libvncclient.so.0.9.12 @$(CMAKE_COMMAND) -E touch_nocreate libvncclient.so And here's the terminal output. [ 1%] Linking C shared library libvncclient.so /home/tools/bin/cmake -E cmake_link_script CMakeFiles/vncclient.dir/link.txt --verbose=1 /home/tools/bin/cc -fPIC -shared -Wl,-soname,libvncclient.so.1 -o libvncclient.so.0.9.12 CMakeFiles/vncclient.dir/libvncclient/cursor.c.o CMakeFiles/vncclient.dir/libvncclient/listen.c.o CMakeFiles/vncclient.dir/libvncclient/rfbproto.c.o CMakeFiles/vncclient.dir/libvncclient/sockets.c.o CMakeFiles/vncclient.dir/libvncclient/vncviewer.c.o CMakeFiles/vncclient.dir/common/minilzo.c.o CMakeFiles/vncclient.dir/common/turbojpeg.c.o CMakeFiles/vncclient.dir/libvncclient/tls_gnutls.c.o CMakeFiles/vncclient.dir/libvncclient/sasl.c.o -lpthread /home/tools/lib/libgcrypt.so /home/tools/lib/libsasl2.so /home/tools/lib/libz.so /home/tools/lib/libjpeg.so /home/tools/lib/libgnutls.so /home/tools/lib/libssl.so /home/tools/lib/libcrypto.so /home/tools/bin/cmake -E cmake_symlink_library libvncclient.so.0.9.12 libvncclient.so.1 libvncclient.so make[2]: *** [CMakeFiles/vncclient.dir/build.make:317: libvncclient.so] Error 1 make[2]: *** Deleting file 'libvncclient.so' make[2]: Leaving directory '/nfs/home/bsferrazza/lfs/ sources/libvncserver/build' make[1]: *** [CMakeFiles/Makefile2:68: CMakeFiles/vncclient.dir/all] Error 2 make[1]: Leaving directory '/nfs/home/bsferrazza/lfs/ sources/libvncserver/build' make: *** [Makefile:141: all] Error 2 You can see it run the ' cmake -E cmake_symlink_library libvncclient.so.0.9.12' command and yet it errors out on libvncclient.so. Oddly, if I then run that same command in the shell, and re-run 'cmake --build .' it continues just fine. So why was that command not properly executed within the cmake file? Thanks, Ben -- 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: https://cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake annotated tag, v3.11.0, created. v3.11.0
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 annotated tag, v3.11.0 has been created at 6fcd7af584670adc762fef0dc72bdb5648274e5d (tag) tagging 61fd4c742013a7f9139db190f936703b656540ff (commit) replaces v3.11.0-rc4 tagged by Brad King on Wed Mar 28 09:01:33 2018 -0400 - Log - CMake 3.11.0 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlq7ki0WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhN/gD/0dl2z8BzYKaEcjVjh+Gksh9152 v2n1MlqVtk83DoCyP9FbbmVJt27M8Nbp2hEdCslCMWKUQ2nIDgRpS7M+90TEwPfo Xb3qBQJmO0UrS3BAUNNVfAg4WFd7VnCAdXGMhWYs6ISYzs8veS6pNOQ/WptQRufD YLkLGgjx/s/qK0dDxv2k+NT+gnsSgPircDxu/ZsEmJCP6blUxOGhorOGFx8GGtew aGgZXnrtdUABBQ2KZ2pJgk2bWtvrJeXFU6OVHJb3fpP+/Kso7imoh0oPR4hrodxQ w2YptaVgjk7r+2iKYAapd9DYXfGpMa+WYHch9qF8vJ1XXv47Hv0oRnYZNxy57HYL j8w5BjjwXHuzUpGVzIQgDnxAdQDFNlZ5O9DfC/2XyvDUBbyOeEyIqyoyrqvcSWiZ YMO+YCHTvkqZW3Q9ncqQy4xTZABWW07vmJ0BOYeM+eYDr9I5IF+CloVSgmsQL1c4 fln0u5zFnAuhJu2GEHOQvdJ8iFtpG9ajkC+SBYomC1M7EPv4QIwwi77RHzqAi08p tQ6TNQ/2rWCXH/4N39f30IMKRc/62ThrdTGNGMxsLIKSB5zDg4vt5cuWLBom6bdQ E2kre5BzhhG25zNSGs36pVrzeKqV9YMRCW1waZP+7Lc6utE3lS7JV9jI2kc/HLcf OMCrLr3YDLB30gTB0g== =k97y -END PGP SIGNATURE- Brad King (9): Features: Record for SunPro 5.15 Merge branch 'sunpro-5.15' into release-3.11 Merge branch 'boost-1.67' into release-3.11 Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF" Merge branch 'revert-CTestTestfile-removal-again' into release-3.11 cmSystemTools: Fix ParseArguments out-of-bounds read ctest_update: Fix crash when handling svn externals Merge branch 'ctest_update-memory-problems' into release-3.11 CMake 3.11.0 Roger Leigh (1): FindBoost: Add support for Boost 1.67 with Python version suffixes --- 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.11.0-rc4-10-g61fd4c7
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 61fd4c742013a7f9139db190f936703b656540ff (commit) from 36881ee4169112147f0ce1e6422c879ced86fec2 (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/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.11.0-rc4-348-g98f23da
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 98f23da8dfe4d6bb90225de83476b6a958c3e284 (commit) via 61fd4c742013a7f9139db190f936703b656540ff (commit) from 5ee25f01aed903649116bf7c4c886ab9d7b893b2 (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=98f23da8dfe4d6bb90225de83476b6a958c3e284 commit 98f23da8dfe4d6bb90225de83476b6a958c3e284 Merge: 5ee25f0 61fd4c7 Author: Brad KingAuthorDate: Wed Mar 28 08:58:55 2018 -0400 Commit: Brad King CommitDate: Wed Mar 28 08:58:55 2018 -0400 Merge branch 'release-3.11' --- Summary of changes: 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.11.0-rc4-9-g36881ee
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 36881ee4169112147f0ce1e6422c879ced86fec2 (commit) via 27f033550a3693df67a30ce94f3c5e60a7a337ec (commit) via 75e8af3354c42ce42abb4bece351fe1a8b99d96a (commit) from 188c5c2a46173b0bcff928098fb406ad925fb3db (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/CTest/cmCTestSVN.h |4 +++- Source/cmSystemTools.cxx | 13 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) 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.11.0-rc4-346-g5ee25f0
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 5ee25f01aed903649116bf7c4c886ab9d7b893b2 (commit) via 36881ee4169112147f0ce1e6422c879ced86fec2 (commit) from 9dd7776cd9b34d2bcfa7740ebd4f23f09ed434ca (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=5ee25f01aed903649116bf7c4c886ab9d7b893b2 commit 5ee25f01aed903649116bf7c4c886ab9d7b893b2 Merge: 9dd7776 36881ee Author: Brad KingAuthorDate: Wed Mar 28 07:25:06 2018 -0400 Commit: Brad King CommitDate: Wed Mar 28 07:25:06 2018 -0400 Merge branch 'release-3.11' --- Summary of changes: 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.11.0-rc4-344-g9dd7776
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 9dd7776cd9b34d2bcfa7740ebd4f23f09ed434ca (commit) via 27f033550a3693df67a30ce94f3c5e60a7a337ec (commit) via 75e8af3354c42ce42abb4bece351fe1a8b99d96a (commit) from cf39c14f46d2e7fc1302a6ec026e3b0efafecf9b (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=9dd7776cd9b34d2bcfa7740ebd4f23f09ed434ca commit 9dd7776cd9b34d2bcfa7740ebd4f23f09ed434ca Merge: cf39c14 27f0335 Author: Brad KingAuthorDate: Wed Mar 28 11:23:14 2018 + Commit: Kitware Robot CommitDate: Wed Mar 28 07:23:47 2018 -0400 Merge topic 'ctest_update-memory-problems' 27f033550a ctest_update: Fix crash when handling svn externals 75e8af3354 cmSystemTools: Fix ParseArguments out-of-bounds read Acked-by: Kitware Robot Merge-request: !1893 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27f033550a3693df67a30ce94f3c5e60a7a337ec commit 27f033550a3693df67a30ce94f3c5e60a7a337ec Author: Brad King AuthorDate: Tue Mar 27 08:41:09 2018 -0400 Commit: Brad King CommitDate: Tue Mar 27 08:46:20 2018 -0400 ctest_update: Fix crash when handling svn externals Refactoring in commit v3.9.0-rc1~156^2 (c++: prefer vectors over lists, 2017-05-04) switched `cmCTestSVN::Repositories` from `std::list` to `std::vector`. This can cause re-allocation when svn externals are processed and break the `RootInfo` pointer that is supposed to point at the first repository element. Switch back to `std::list` so that the address remains stable. Fixes: #17854 diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h index dbc7fde..a467ede 100644 --- a/Source/CTest/cmCTestSVN.h +++ b/Source/CTest/cmCTestSVN.h @@ -8,6 +8,7 @@ #include "cmCTestGlobalVC.h" #include +#include #include #include @@ -70,7 +71,8 @@ private: friend struct Revision; // Info of all the repositories (root, externals and nested ones). - std::vector Repositories; + // Use std::list so the elements don't move in memory. + std::list Repositories; // Pointer to the infos of the root repository. SVNInfo* RootInfo; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75e8af3354c42ce42abb4bece351fe1a8b99d96a commit 75e8af3354c42ce42abb4bece351fe1a8b99d96a Author: Brad King AuthorDate: Tue Mar 27 08:18:47 2018 -0400 Commit: Brad King CommitDate: Tue Mar 27 08:46:20 2018 -0400 cmSystemTools: Fix ParseArguments out-of-bounds read When checking for a Windows-style leading path, do not read past the null terminator. Issue: #17854 diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 88cfe81..eeb73c3 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -550,12 +550,13 @@ std::vector cmSystemTools::ParseArguments(const char* command) bool win_path = false; - if ((command[0] != '/' && command[1] == ':' && command[2] == '\\') || - (command[0] == '\"' && command[1] != '/' && command[2] == ':' && - command[3] == '\\') || - (command[0] == '\'' && command[1] != '/' && command[2] == ':' && - command[3] == '\\') || - (command[0] == '\\' && command[1] == '\\')) { + if (command[0] && command[1] && + ((command[0] != '/' && command[1] == ':' && command[2] == '\\') || + (command[0] == '\"' && command[1] != '/' && command[2] == ':' && +command[3] == '\\') || + (command[0] == '\'' && command[1] != '/' && command[2] == ':' && +command[3] == '\\') || + (command[0] == '\\' && command[1] == '\\'))) { win_path = true; } // Split the command into an argv array. --- Summary of changes: Source/CTest/cmCTestSVN.h |4 +++- Source/cmSystemTools.cxx | 13 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits