[Cmake-commits] CMake annotated tag, v3.8.0-rc2, created. v3.8.0-rc2
s Tests: Add case for RPATH exclusion of symlinks to implicit directories Merge branch 'csproj_add_free_source_tags' into release Merge branch 'implicit-dir-symlinks' into release Merge branch 'FindVulkan-update' into release Merge branch 'FindJNI-archlinux-jvm-paths' into release CMake 3.8.0-rc2 Gregor Jasny (1): Utilities/Sphinx: Port cmake extension to Sphinx 1.4 Kitsu (1): FindJNI: Add jvm paths for Arch Linux Michael Maltese (1): Help: Clarify 'make-style' variable references in cmake-language(7) Michael Stürmer (3): VS: add VS_CSHARP_ sourcefile property VS: add CSharpUtilities module VS: add test for VS_CSHARP_* source file property Orion Poplawski (1): KWIML: Add -Wno-format-security to tolerate -Werror=format-security Robert Maynard (1): CUDA: Detect the toolkit include directories Sebastian Holtermann (1): Autogen: Fix headers not skipped Wilfried Goesgens (1): ExternalProject: Clarify documented role of `INSTALL_COMMAND` --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.8.0-rc1, created. v3.8.0-rc1
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.8.0-rc1 has been created at b47338086e2c434b4d7958ef114f24abe9541316 (tag) tagging 84df4a49500e51ac6e2a19a77e385e66234386f7 (commit) replaces v3.7.2 tagged by Brad King on Tue Feb 7 09:22:18 2017 -0500 - Log - CMake 3.8.0-rc1 -BEGIN PGP SIGNATURE- iQJKBAABCAA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAliZ2BoWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhE25EAClV46/njUVlLQrvPj25cIvjPX3 rAkET+THc5sc7sWueW/bUzSO4RFqTYLaXPrEYvE8pACa28HDPX4UHSaitO80MAo4 UVKyS4upOPGHF3lhLFi4CfaqqY9qdx3uTh7C70ZurZub8cPX1ahA6/v4ONct5eRk N/6qAArnS5+zteXOYzGriUknnkj9KztTEm1iZzjxIHtSCrlKgCL/id+9UReiwddr X3ZOPKIZvg8f8gAUz7GGzQJIPLiDcPcAr21AGGUW0jwmGkxDetUofunXZa4E6Chd iaRYa1MtXf3yFftISH4Vwo2pxuwNY59CX7xRE9sfUiYuq02QKJfRHP4WMw/Tx6k+ AwgWYU97L9ywJA1H6+7ZupIXBXkPq/eepBN4ZRnAqKvPoSbd4YZM0PttoL110GoW 1lZLXg3lfsfhWHPCdHjTegLGbO0tNiEbkFjHfIr4+h+k469IxYiNtjkZZGc42JiY hy7QOsMMEDy8OgWHqp/M5DrqrY1syyFFynfYII9EPmhVbR7f2JOsKDu1wv3jCp+k /BYlwSzq+sapHojhkPpiS8ptVsNfZimYT7GXZcIzeD2Rm0LPY2rGc+hsoF7NV8BQ GW85TUp4BWntjwVLtPY99kM7GRo8ABZ0J/Lc7i4Tt8rDOmLTAWO5jkLJ1/DJUsAR f7xRjVWV8xFnnn9RHQ== =HMVM -END PGP SIGNATURE- Adam Martin (1): FindProtobuf: Search for debug library named with `d` suffix Adam Weisi (1): Eclipse: Fix indexer for subprojects Alex Turbov (5): FindBoost: Use string(APPEND) in more cases FindBoost: Use list(INSERT) to simplify suffix list generation FindBoost: Minor style updates FindBoost: Simplify library dir detection with cascading if/elseif/else FindBoost: Search official location of prebuilt binaries on Windows Alex Wang (1): Features: Fix cxx_right_angle_brackets compiler feature test Alexander Adam (2): CPack/RPM omit unsupported tags CPack/RPM test for Suggests tag Alexander Voitenko (1): QtIFW: Added new options to QtIFW cpack generator for modifying wizard style Alexey Sokolov (1): UseSWIG: Automatically scan dependencies of SWIG files for Makefiles Alexis Murzeau (1): Ninja: Use binary dir for `$subdir/all` targets Andre McCurdy (1): CheckFunctionExists.c: avoid gcc warnings with -Wstrict-prototypes Ben Boeckel (8): cmcldeps: search for single-byte strings as characters cmcldeps: append strings as strings cmcldeps: prefer the /TC flag ExternalProject: fix typo ExternalProject: support GIT_PROGRESS argument ExternalProject: support extracting the configure command FindHDF5: use the target rather than the path cmSystemTools: use the actual case for root detection Bernhard M. Wiedemann (3): cmTimestamp: Support SOURCE_DATE_EPOCH to override current time string: Teach TIMESTAMP to treat %% as % Tests: make tests pass with SOURCE_DATE_EPOCH set Betsy McPhail (1): ctest_memcheck: Add DEFECT_COUNT option to capture defect count Bill Hoffman (2): ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to project ctest: Improve output for `-T memcheck` Bjoern Thiel (2): InstallRequiredSystemLibraries: Distinguish UCRT install configurations FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC Brad King (590): Merge branch 'release' Begin post-3.7 development Merge topic 'fix-doc-3.7-relnotes' Merge branch 'release' Merge topic 'add-BUILD_RPATH' Do not define cout/cerr preprocessor symbols Utilities/Release: Drop macOS .tar.Z binary Utilities/Release: Drop Linux .tar.Z binary Merge topic 'no-tar.Z-binaries' Utilities/GitSetup: Fetch local hooks via https Utilities/Release: Update README to reference https URL Merge topic 'utils-https-cmake.org' Merge topic 'qtifw-https-cmake.org' Merge topic 'no-define-cout-cerr' Merge topic 'fix-VS-resources-pri-path' Merge topic 'cmake-server-improve-shutdown' Merge topic 'FindMatlab-fix-simulink-cache' Merge topic 'FindMatlab-documentation' Merge topic 'check-libuv-minimum-version' Merge topic 'cpack-rpm-debuginfo-fixes' Merge topic 'mips-rld-map-rel' Merge topic 'vs-15-preview-5' Merge topic 'android-ndk-r13' Merge topic 'codelite-global-setting' Merge topic 'CMP0065-LINK_FLAGS' Merge topic 'cleanup-Convert' Merge topic 'cpack-rpm-single-debuginfo' Merge topic 'nmake-encoding' Merge branch 'release' Tests: Improve RunCMake.CPack_* failure message formatting Merge topic 'FindProtobuf-fix-subdirs' Merge topic 'android-cxxabi' Merge topic 'android-export-has-cpp' Merge topic 'update-kwsys' Merge topic 'test-cpack-improve-failure-messages' Merge topic 'cmake-cleanup' Merge topic 'minor-cleanups'
[Cmake-commits] CMake annotated tag, v3.7.2, created. v3.7.2
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.7.2 has been created at 833dd96db6829aebc05ed21895ded0ed8981adc9 (tag) tagging 35413bf2c1b33980afd418030af27f184872af6b (commit) replaces v3.7.1 tagged by Brad King on Fri Jan 13 10:19:44 2017 -0500 - Log - CMake 3.7.2 -BEGIN PGP SIGNATURE- iQJKBAABCAA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlh48BAWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhK+mD/4h9d3wQlYJdwKW5CejQTedagxH mdCNyoAEVJTyndo9LcS9VLcXRopJ8623XxSosWB5szPetHSY9fJwqqK6Sz6avVft S7T2jTX66UB1e1v4bMhHYdTpmAT7Me+S30VTwYspodVmWrvExYYnFyp2gDnfp3WI 23dWOORF8LTry0LNJFd8nLO85nPhgRXqGNafiKG4CKF9pccqDcLQT6isILEEKvXS mUIM7zoID4Ncg2ZDtLetyGdF5pFWtmR/H9GB8svTZuiDDgWwKEWuLpW38B7ljMIQ +f1Jc5/RW6LL3MTYpZGQQzBsZSH69Ze7Afth9VMXaioyegJ8rywUuNXNbHfjhWCX gGs0jeI604BQ6wD1/A1xG6RNGOVmYd4CX5vlRr1zkWVG8JNSpNfoyKgdxVs8tJCt iYO4QY+eFENfh2NLk3gG3X1tu8yhM7/kE8FTq7ZPVMWUp97HN5Ca5igSPU5JujQW Ww2Y6jZHakpMHvMONy0v+zrT0HRTYRNQGGOvS22XsB/fS+H+z2r8jrkWfXvggS69 5vd0m7dd9UvxhFIzTisajXZR43gbS8legf/5ot4nWCmOI+I6OAYFfQnGTtdSD+9L kDaQwYzklBf8+LNeHU0SHxK6VaFhoCAl88Zkw886vxz4Z1lfuz9tJRg0zdfOYmht VKy76K/VHR4FdERuOw== =0V1v -END PGP SIGNATURE- Aleix Pol (1): cmake-server: Do not try watching subdirectories with empty names Brad King (13): Merge branch 'cmake-server-pad-arguments' into release VS: Add v141 flag table entry for `-Zc:inline-` VS: Add v140 flag table entries for `-Zc:inline[-]` Merge branch 'vs-Zc-inline' into release VS: Fix standalone Windows7.1SDK toolset selection Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into release Merge branch 'FindBoost-vs15' into release Merge branch 'mr-reset-error-flag-on-configure' into release Merge branch 'cmake-server-do-not-crash-on-interface-lib' into release Merge branch 'pgsql-yum' into release Merge branch 'FindBoost-1.63' into release Merge branch 'cmFileMonitor-skip-empty-names' into release CMake 3.7.2 Roger Leigh (1): FindBoost: Add support for 1.63 Rolf Eike Beer (1): FindPostgreSQL: automatically find installations from yum.postgresql.org Tobias Hunger (3): server-mode: Do not ignore the first cacheArgument on configure server-mode: Call ResetErrorOccured before configure server-mode: Do not crash when running into INTERFACE_LIBRARY Vic Luo (1): FindBoost: Add support for VS 2017 --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.7.1, created. v3.7.1
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.7.1 has been created at 26aac2d7f704e19fc5f8b8958716944b2a1d502a (tag) tagging db3499df5d06ab2cacc61e9f7720a33456aeafe4 (commit) replaces v3.7.0 tagged by Brad King on Wed Nov 30 11:18:42 2016 -0500 - Log - CMake 3.7.1 -BEGIN PGP SIGNATURE- iQJKBAABCAA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlg+++IWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhH8cD/0TvFgg9ejxW/G82mRqUpZYPTu4 RSakfjGDKrOWbiTZUoOnHENw1yqJIMKzSLx9tXFATksJwIW62pbEax1iBVapYnfR MLC9SAldh5prbDHX2m9ukaYeROYAUUzgdd1rIrnytUx4UvWFPpktApxfgSOkixQi q5I36lHgYHAR+xAakcz5EjvZHqs+GYEDGIhc+5uquDnfPzy/XUGIG1ebTvlhM70e PVaaxEhV8Og/ghiZUvh5+46N5+PxzRKkQ0Pa2gGpVVtIxWaNdHKzwJIytB7yuV5w SiWc0gfhEgMYqmB3z8+9pJaHHRck45KoHbdsQHvKhNk/cIuRtCLtkGgnf2sau1vH l++feII4xzGTflrY+o+w2W3HFfLVXeXxT/urKhjQwbTkunGsWeTjv3ylwqgyckZY wLp4WZj81I+2Yxoae3SGKq9JRLBmx9dVX8QzwPha8X6rIUNZ8iAQjKx1VYrGFOj5 JAhpHX75KL20ytZknkoxKnsVIBU/suJCCF4NwC4/AMMKHlrxV+Mq3fANJM2c9CHK 236KugYALs1RDsC5dy9pceEMpuOMICvqBA5QgNSjUjvWjKig4BVbImf3VWQysEUB UFtpp//t9t8GfOKA4/INj1I5bw/KKhgrCZlEdAwzi2I0NxmEcdxb2bd63SQ5gKln D5yai09SVZQUwl4y2w== =9pHp -END PGP SIGNATURE- Ben Boeckel (1): ARMCC: Fix flag used for response files Brad King (19): VS: Update VS 15 generator for Preview 5 FindBISON: Do not rebuild every time when not VERBOSE Merge branch 'FindBISON-fix-rebuild' into release Merge branch 'cmake-server-fix-16422' into release Merge branch 'cmake-server-fix-16423' into release Merge branch 'armcc-response-file-flag' into release Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable Android: Add CMAKE__ANDROID_TOOLCHAIN_MACHINE Merge branch 'backport-android-info-variables' into release Merge branch 'vs-15-preview-5' into release Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable Merge branch 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into release Merge branch '16449-revert-xcode-system-includes' into release libarchive: Add headers to adapt between OpenSSL 1.1 and older versions libarchive: Add support for building with OpenSSL 1.1 Merge branch 'libarchive-openssl-1.1' into release Merge branch 'vs15-rename-generator' into release CMake 3.7.1 Gregor Jasny (1): Revert "Xcode: Obey SYSTEM keyword for includes (#15687)" Roman Wüger (1): VS: Rename VS 15 generator to 'Visual Studio 15 2017' Tobias Hunger (2): server-mode: Prevent possible crash when watching directories server-mode: Reset GlobalGenerator before configure --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.7.0, created. v3.7.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.7.0 has been created at d74267fba053e579aba44ac53059a671b58a9d41 (tag) tagging 5cfc2e926af645840c6a0464451af18f08528879 (commit) replaces v3.7.0-rc3 tagged by Brad King on Fri Nov 11 10:30:10 2016 -0500 - Log - CMake 3.7.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdBQJYJeQCFhxicmFkLmtpbmdAa2l0d2FyZS5jb20ACgkQLSzvEDSS FoTQug/+Lr1+9hfhPfc33bqaMv/3J+NYykEtLKNSErXixGSkojX9gC32lEmTjv3j hyZGE5WlGwoKVRVBmjzjQe/ciw11EsEnUH+iZp08Tooh2WMuxjLLVcvjXVKM9Hal oAl+xggSIvIaWr0bphqhM9U5GM6mi7NhFbaLE3k8uPgwwf6XsozgYO2nWsLZTA1K kgL3VCHUlEVph2t2hq3ephOg3MrYxwrmq0X0eXXrsDioyEraVw3vM+keySGe2OUD FEai+rm0C42ZUYgtSKe/qIdirtifmuVV+Fy20PRCnpHEH3CszZXSQOu3SNjq/Uu7 zw/qgDsjQmBchQ8fkj8Q92nQRABtswCpGmPhSs+q715TLuLJeGX9u4K9EFkvmMMX RM5hglrcE5Akx0PMwHwlDOrk+QkYupkJQxwQsh5sxqoblRXudQq/+158ItvVCnoc zevmwqOjTjpZwozytnt7wBdy8qj6OO0By5KSKHDIA2f2Vw7O0eAgdchS4LUCnZ7r VOTlM3hokndy2ZiBpYatos6nvDO6M0rUquXg030yo7FRren8EqcgjMrXBduoI+CP eWDU7hKx8L4tNeCxcZvEDIbegSA83VO2/eMIwJx97+5dz15uQ8ekn8UkIipwtwjM uk8zTHmmMJfCJpXNrDNFabGk3/HmBXUOuPYGeMcg3/51F8tpCt8= =c0iK -END PGP SIGNATURE- Brad King (4): Merge branch 'pkgconfig_imported_target' into release QtAutogen: Do not re-generate AUTORCC outputs on every build Merge branch 'autorcc-only-no-rebuild' into release CMake 3.7.0 Florent Castelli (1): PkgConfig: Fix FindPkgConfig imported target feature --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.7.0-rc3, created. v3.7.0-rc3
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.7.0-rc3 has been created at b663e41ce3f8a4a831ec7d1363e9d7491069bace (tag) tagging adf5f253ec029aec4ee7aadb95c6f908030fb98b (commit) replaces v3.7.0-rc2 tagged by Brad King on Fri Nov 4 09:45:15 2016 -0400 - Log - CMake 3.7.0-rc3 -BEGIN PGP SIGNATURE- iQIzBAABCAAdBQJYHJDrFhxicmFkLmtpbmdAa2l0d2FyZS5jb20ACgkQLSzvEDSS FoTCThAAhBEfFpCSBfdSNc5wQaZ2Ji1uDmIlQB5vuxVkLLRxXupGpYK2zEvaAWER KirAXUdyXdD0S8Gh6bsc8nHEVu10UClt6fSolG1XwRMogxV9oHJW9UQX1gTJAFWQ JLt2dsVAeEFIfRlJML0UcfPzLT1GNeNPnrV0x/ehDOEChnoilibY38/1qIT7ZrGz L71C223HYImtlClkV1KG2fHj8cOZ46BOjHIHU43AYRsNMzYtNi9L+fWaCGDKh+G0 48anhQv8u/Ky6qFK/sf4KNm4UxVI/u+lbsX0gnsLNO/WgWmUJDjyCIG+d/eKW92m oJXV7P1rYNDqfz0+ZD72hXxBoiVan8ttPhJotq5Q83d6PKRtXUZP4i5KS3hRT1aQ m3bxjIKctBSmRdsEpizdsgn8rCPEHktVFLHJk7/RAd33GHUYO2W0ex9OZKLPOAa/ CXnC7MjDj6t3jgY/yJsbTC/ovjZ+EUtVMb4Z1GJoALgC42M60MbIVvmYY37GGCUg fap1O/IDiJK7YilQw0s3O6/GObMNY4ooCKlkVRkJTMa6l9Ao5hbIaJIzc+8J61UM 67jsD8H1CkQjBa0AeAB9pZhXMnYXuznVBvOK83FsYc8d3vEV/D5CFbjdiadQ3h71 SBfso0UWskavW8vhHU/SsPt6b/jYqq0wjBO+B3y2gYod6MhXxkM= =MQtL -END PGP SIGNATURE- Alex Turbov (3): CPackDeb: fix copy-n-paste typos in documentation CPackDeb: Fix incorrect variable name in documentation CPackRPM: Fix incorrect variable name in documentation Alexis Murzeau (1): Ninja: Use binary dir for `$subdir/all` targets Brad King (25): Android: Fix support for armeabi with c++_static Merge branch 'android-armeabi-c++_static' into release Android: Add missing link flags for device executables Merge branch 'android-link-exe' into release Merge branch 'doc-cmake-server-typos' into release Merge branch 'backport-ninja-subdir-binary-dir' into release Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically Android: Link position-independent executables with proper flags Merge branch 'android-pic' into release Intel: Fix compiler extension flags on Windows cmake-server: Change message wrapper to avoid ambiguity with content Merge branch 'intel-compile-features-windows' into release Merge branch 'cmake-server-message-quoting' into release Features: Record features for Intel C++ 17 on UNIX Merge branch 'intel-17-features' into release Merge branch 'cmake-server-handshake-improvements' into release Merge branch 'FindMatlab-9.1' into release Merge branch 'FindMatlab-fix-typo' into release Merge branch 'fix-macos-sysroot' into release Merge branch 'cpack-doc-typos' into release Merge branch 'doc-cmake-qt-fixes' into release FindHDF5: Restore pre-3.6 behavior of finding only C by default Merge branch 'FindHDF5-restore-default-C' into release Merge branch 'cpackifw-search-algorithm' into release CMake 3.7.0-rc3 Francesco Romano (1): FindMatlab: Add support for Matlab 2016b (9.1) Gregor Jasny (2): Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path" Darwin: Remove deployment target version check Konstantin Podsvirov (1): CPackIFW: Update search to find QtIFW distributed with QtSDK Marcus D. Hanwell (1): Help: Update example Qt 5 find_package call to use COMPONENTS Matthew Woehlke (1): FindMatlab: Fix typo in matlab_add_unit_test implementation Thiago M. de C. Marques (1): Help: Update example Qt 5 find_package call to add missing component Tobias Hunger (3): Help: Fix cmake-server documentation cmake-server: Better error reporting during handshake server-mode: Handle generator toolset and platform in handshake --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.7.0-rc2, created. v3.7.0-rc2
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.7.0-rc2 has been created at 43fe2e0863278f06ccd9cd7e845ff9b0fd7031b9 (tag) tagging 876da11858ab6649bb088c4bb7758fc84910ba20 (commit) replaces v3.7.0-rc1 tagged by Brad King on Wed Oct 19 10:53:36 2016 -0400 - Log - CMake 3.7.0-rc2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdBQJYB4jwFhxicmFkLmtpbmdAa2l0d2FyZS5jb20ACgkQLSzvEDSS FoQo+w//Q4sgQCUH2rYOCMleN0N95xOdDcawh1nhdF5Fl7TvGVK4sNAM6NBjdPKD tA+jYZ15AkXMbk0+mDo7Y2bZziujbZvpU6iiKxdaZ+h+lHiUEAFMUm15j+wgldj9 qFcQFEVRmHR0EPSDLntxa3LfCtYTR6F2QEAeye9inqWwzXplZV7zz+5jHwAHnJpM YQV777aQ4uYyt0OAwtv5jYQjp07jzcbg3uleLds3TNynId7ChiMYZNO3Kao0eDrC qdBqVfCRzDo/UtxHAAdcndRtzvEgLIPHQx84vwR1tiFHg4o1l/caxWZSM0aXxbv5 JmDmx5hIV7XLA0XhwyHHuV5gnIhhN85FuCp0UrmFeJiIFH+H5xggTYm9t59gioB4 KT3dv6skStNGalhEuhT8MleLDNnouEjv2Jf4yOZvNvMDpf5lj6qva1dfmNYDNAEZ 9os5q+QVG+HsAv5dfXj5oqqSpYdYVRKBVs8A9UvpAB9cPxKJdqtpVQSLcTCROyxc bCvMa0rP3idW9ws19UGA6s1oNO7rGcw3jXZyX7ZKOcTLDk7vXqiuEDDXZAj1vOBY sL+vXZbD3cSfJcIXdLWTnp9Cx5vdxgh2H9v64/oJyMfGWxOECLGD4hfMHDIjtQbb uM/UcX6tmC46tMqHd6FtsA0vvvO4P63M5hbD95BJnfSLbjctKKQ= =/HQ7 -END PGP SIGNATURE- Ben Boeckel (3): Ninja: Fix RC language depfile generation with cmcldeps ExternalProject: error out only if the property is unset ExternalProject: make SOURCE_SUBDIR directly appendable Brad King (43): QtIFW: Reference cmake.org via https in cmake.org.html Merge branch 'cmake-server-improve-shutdown' into release Merge branch 'qtifw-https-cmake.org' into release Merge branch 'fix-VS-resources-pri-path' into release Merge branch 'FindMatlab-documentation' into release Merge branch 'FindMatlab-fix-simulink-cache' into release Merge branch 'cpack-rpm-debuginfo-fixes' into release Android: Suppress -Wattributes warnings in test case builds Android: Update libc++ include directories for NDK r13 Merge branch 'android-ndk-r13' into release Merge branch 'codelite-global-setting' into release Merge branch 'check-libuv-minimum-version' into release Android: Fix support for cxxabi.h with libc++ Merge branch 'android-cxxabi' into release Merge branch 'FindProtobuf-fix-subdirs' into release Android: Record use of C++ by static libs in exported Android.mk files Merge branch 'android-export-has-cpp' into release Merge branch 'upstream-KWSys' into update-kwsys Merge branch 'update-kwsys' into release VS: Split flag table between v140 and v141 toolsets Merge branch 'vs15-separate-flag-table' into release Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into release cmake-gui: Fix "extra" generator entries in drop-down list Merge branch 'cmake-gui-fix-extra-generator-names' into release Merge branch 'ice-3.6.3' into release Merge branch 'ninja-rc-regression' into release Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into release Ninja: Fix POST_BUILD commands on macOS Frameworks Merge branch 'ninja-framework-POST_BUILD' into release Help: Clarify `ctest_*` APPEND option behavior Merge branch 'doc-clarify-ctest-APPEND' into release Help: Fix math(EXPR) documentation formatting Merge branch 'doc-math-EXPR' into release Merge branch 'osx-no-deployment-target-on-cross-compile' into release FindwxWidgets: Fix finding unversioned VS-built directory prefixes Merge branch 'FindwxWidgets-unversioned-library-path' into release Merge branch 'external-project-source-subdir-usage' into release Merge branch 'cmake-server-pipe-mode-fix' into release VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support Tests: Fix VSNsightTegra test on Android NDK r12b Tests: Add VSNsightTegra test for VS 2015 Merge branch 'fix-Android-NsightTegra' into release CMake 3.7.0-rc2 Chuck Atkins (2): Use find_package for JsonCpp and LibUV instead of include Set minimum version for LibUV to 1.0.0 Domen Vrankar (2): CPack/RPM debuginfo package objdump error suppression CPack/RPM debuginfo package without binaries Gregor Jasny (1): OS X: Do not try to set deployment target when cross-compiling Jamie Snape (1): Honor LINK_WHAT_YOU_USE when set to OFF KWSys Upstream (1): KWSys 2016-10-07 (dfe9b386) Martin Joly (1): FindProtobuf: Fix protobuf_generate_*() to handle subdirs Max Smolens (1): ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGS Raffi Enficiaud (3): FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfigured FindMatlab: small documentation fixes Help: Extend 3.7 release notes for FindMatlab Roger Leigh (1): FindIce: Add support
[Cmake-commits] CMake annotated tag, v3.7.0-rc1, created. v3.7.0-rc1
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.7.0-rc1 has been created
at 4d730d27aa8695ec3ce3608b3f6fefb5685635fb (tag)
tagging 1dc252ecf4d0946196133734540ebe8e90f312d3 (commit)
replaces v3.6.2
tagged by Brad King
on Tue Oct 4 11:02:55 2016 -0400
- Log -
CMake 3.7.0-rc1
-BEGIN PGP SIGNATURE-
iQIzBAABCAAdBQJX88SfFhxicmFkLmtpbmdAa2l0d2FyZS5jb20ACgkQLSzvEDSS
FoS9Lg//WrbCDruc9tBfeXGs1RdexiTl794TOBhhd5Yq6sDmpfnlHpWgO1MoxGbl
qT6seb3a4h5dcBPWiccb8ElGsM6TUiwytTXLH+U19teteJOTA4RW7ioWbx0CUg4J
KtEkQy0HW/BrQHIRbhrlO7FXQ72QLak72Rv2kA5nCGymh813BrqRBdcrae2+8SAZ
L8C11vhIPQwKgwrByOMflmnUTLMyo49eME/D+LHt7i2VY7vWZS3Eap34jQCerEX7
FPGwp7AVPowB+ePHdwP+wpeyq5WU4nwwFVKcHgghu0azTk8uPrBiNwW9sioNtAys
p6ewVAqERj7MUF2D9ORNxJKkos+0P5+GCXJqrNUDjQWHM1/mOr12emPlbpU2WoQC
YbY3xWGN/WggSCk+iN1AYfbRcwoahHXHLOKta2SbR0VM+qUUnlk5P3HaozXg4+h/
6/zeZRFnWRr3lNlifQv6+PBtB5RhuB434uSjIADcHPepsHAgXUzsxG3iy3dXiQpN
gd994fzxBTqNIdXXYo0xOBhyP8je5wc2kLfZXZn9pz/2YzP44yMo5sQP9EkJCdjG
0UEXIoCsowNDYeyphJZ6XghcG1351c+PXr/husLjJ2NWdZ+V+t6eQeehb5D2GRLV
PuwMtmxStfSZQa7tqAk0qyLkeo5askocquxyWF5g/neQ9Knypsg=
=UPm9
-END PGP SIGNATURE-
Alex Turbov (5):
FindBoost: Test `CMAKE_CXX_COMPILER_{ID,VERSION}` instead of `MSVC*`
FindBoost: Search in official Windows prebuilt binary library directory
cmake: Add an option to control what files needs to be traced
FindBoost: Add check headers for `zlib` and `bzip2`
ExternalData: Hide security-sensitive details from output
Alexander Shishenko (1):
GetPrerequisites: Always filter objdump output as text
Alexis Murzeau (1):
FindOpenSSL: Fix detection of OpenSSL 1.1 Win32/64
Andreas Weis (1):
FindBoost: Make imported targets fall back to `Release`
Andrew Fuller (1):
CPackRPM: Handle directives of form %foo and %foo(anything)
Ben Boeckel (16):
Help: clarify PARENT_SCOPE behavior
cmFindPackageCommand: use iterators to loop over configurations
cmFindPackageCommand: remove duplicate paths from error message
Aux: check spelling in comments
Aux: highlight Lua-style comments
Aux: remove unused highlight links
Aux: highlight deprecated commands as warnings
Aux: highlight conditiona and repeat commands differently
Aux: highlight modules using Include
Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variables
Aux: sort the highlighting list
Aux: highlight commands using Function
issues: update references to the CMake issue tracker
update-third-party: support Git 2.9.0's new merge restrictions
cmGeneratorTarget: factor out a space
ninja: error out on relink requirements
Ben Campbell (1):
FindGIF: Detect version from GIF 4.1.6 and above
Ben Keller (1):
install: Fix computed import prefix in export files when it is "/"
Benjamin Ballet (2):
VS: Handle VS_GLOBAL_RootNamespace special case
VS: Explicitly default to v100 toolset in Visual Studio 2010
Bill Hoffman (8):
Add options to run `ldd -u -r` as a "link-what-you-use" tool
Export: Factor out file generation steps into helpers
Export: Virtualize file generation step helpers
cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#
Add support for creating prebuilt Android.mk files
FindMatlab: Extend matlab_add_unit_test to run arbitrary test code
ctest_coverage: If gcov is not found just warn, not error
CTest: Add CAPTURE_CMAKE_ERROR val to `ctest_*` commands
Boris Fomitchev (3):
FindCUDA: Adjust vertical whitespace
FindCUDA: Refactor Android(Tegra) support
FindCUDA: Support `2.1(2.0)` architecture notation
Brad King (709):
Merge branch 'release'
Begin post-3.6 development
Merge topic 'bin-dir-option'
Merge topic 'minor-cleanups'
cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
Modules: Rename internal platform-specific compiler determination modules
CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)
CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
Merge topic 'FindHDF5-fix-already-found'
Merge topic 'simplify-boolean-expressions'
Merge topic 'fix-ti-link-order'
Merge topic 'compiler-id-with-bracket-in-path'
Merge topic 'FindOpenCL-imported-target'
Merge topic 'size-empty'
Merge topic 'cpack-nsis-remove-duplicate-include'
Merge topic 'fix-TARGET_PROPERTY-LOCATION-crash'
Merge topic 'minor-cleanups'
Merge branch 'release'
Merge topic 'FindLibArchive-3.2'
Merge topic 'FindBoost-vs-prebuilt'
Help: Add notes for 'productbuild' topic
Merge topic 'productbuild'
Merge topic 'remove-c_str'
Merge topic
[Cmake-commits] CMake branch, next, updated. v3.6.2-2225-gae94988
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 ae94988166f856e3ef03ba58f16efba93ffa7994 (commit)
via 6c394bcb384ded1d609111fda2726ee35303f0fc (commit)
from b84b2d40fe7f0b88b919633893351c32762385c8 (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=ae94988166f856e3ef03ba58f16efba93ffa7994
commit ae94988166f856e3ef03ba58f16efba93ffa7994
Merge: b84b2d4 6c394bc
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Mon Sep 19 14:28:15 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 19 14:28:15 2016 -0400
Merge topic 'cuda_use_cudadevrt_with_separable_compilation' into next
6c394bcb FINDCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION
is ON
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c394bcb384ded1d609111fda2726ee35303f0fc
commit 6c394bcb384ded1d609111fda2726ee35303f0fc
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Fri Sep 16 13:34:04 2016 +0200
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Mon Sep 19 13:46:25 2016 -0400
FINDCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION is ON
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 317a9cd..9ef1419 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -303,6 +303,8 @@
#CUDA_ADD_CUBLAS_TO_TARGET macro).
# CUDA_cudart_static_LIBRARY -- Statically linkable cuda runtime library.
# Only available for CUDA version 5.5+
+# CUDA_cudadevrt_LIBRARY -- Device runtime library.
+# Required for separable compilation.
# CUDA_cupti_LIBRARY-- CUDA Profiling Tools Interface library.
#Only available for CUDA version 4.0+.
# CUDA_curand_LIBRARY -- CUDA Random Number Generation library.
@@ -564,6 +566,7 @@ macro(cuda_unset_include_and_libraries)
unset(CUDA_CUDARTEMU_LIBRARY CACHE)
endif()
unset(CUDA_cudart_static_LIBRARY CACHE)
+ unset(CUDA_cudadevrt_LIBRARY CACHE)
unset(CUDA_cublas_LIBRARY CACHE)
unset(CUDA_cublas_device_LIBRARY CACHE)
unset(CUDA_cublasemu_LIBRARY CACHE)
@@ -794,6 +797,10 @@ else()
set(CUDA_USE_STATIC_CUDA_RUNTIME OFF CACHE INTERNAL "")
set(CUDA_CUDART_LIBRARY_VAR CUDA_CUDART_LIBRARY)
endif()
+if(NOT CUDA_VERSION VERSION_LESS "5.0")
+ cuda_find_library_local_first(CUDA_cudadevrt_LIBRARY cudadevrt
"\"cudadevrt\" library")
+ mark_as_advanced(CUDA_cudadevrt_LIBRARY)
+endif()
if(CUDA_USE_STATIC_CUDA_RUNTIME)
if(UNIX)
@@ -1714,6 +1721,12 @@ macro(CUDA_ADD_LIBRARY cuda_target)
${CUDA_LIBRARIES}
)
+ if(CUDA_SEPARABLE_COMPILATION)
+target_link_libraries(${cuda_target}
+ ${CUDA_cudadevrt_LIBRARY}
+ )
+ endif()
+
# We need to set the linker language based on what the expected generated
file
# would be. CUDA_C_OR_CXX is computed based on CUDA_HOST_COMPILATION_CPP.
set_target_properties(${cuda_target}
---
Summary of changes:
Modules/FindCUDA.cmake | 13 +
1 file changed, 13 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.2, created. v3.6.2
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.6.2 has been created at 9893496e9a282902248fe4876f232c7c8293b623 (tag) tagging c5dcd31e92c0a09009a340e3fe23ced4f6190b64 (commit) replaces v3.6.1 tagged by Brad King on Wed Sep 7 11:54:05 2016 -0400 - Log - CMake 3.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJX0DgeAAoJEC0s7xA0khaE7dAP/js/SUePSOq8jFXzqD0Ri9ha XemAKmCDRx89oQdj3m2LP9WuDI4NNO1qeh4c68nar14XgRkPyzbByTBBRI0q1WgS mZPqT6oOBq/QJ5zoq2DcG4eUoBbUHQ7W9CBVIEJEogtYlNHlLkMcWFbzZbw/K9X0 kpoFK1X8YfYUMUBeGukeUhoLijbMgY3JtaCEJPtENV6uP62ijmMQ6w6cswmzjNJ6 ZIKJ3jmqpTehzP2/6gRkRmTWkI1F17Lkd7Fg7gO47QzSou2XDtlaA6FGIGHiCplI Q1m7nGbDsT+aSFCwMWKi9tzpEqM/yS/3q2Lx9lVm/l5HLQahZ50R9086N8FLWdhH 1yKRBqBqvb+zM+PirFdL0abJN/aYc09xj7bFdIoYab1dxd95rZY0lNqE6mXdVap+ wMtctcrlsPg9/AO1fiU7jBd8djXrNs+00k8OAnOVzlvdvkyDhaERmybGWqKJIS4k UTakWQCS108l9+byhqSyS5G2iY7u/eXDKgD7e8FeZLZhUc23LdffbJzv83dqN9tX ujEIPkMNfjfG2S0+16u/d8EUKAdjxhJ3RvZwrwLokYNSvzKDDvwI4Ph/O9m8QFEZ TkrPekK1Zx2PBGq4vFisvjXTc6nrTCSK8IRUHridexwt8RLbU41qVyhsFvNWhAu/ idM32M7RkCOsgroWRwwZ =A8Qb -END PGP SIGNATURE- Ben Boeckel (3): Intel-C: declare support for gnu11 Intel-C: support gnu89 and gnu99 extension flags Intel-C: standard flags are also supported in 12.0 Brad King (26): Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into release Merge branch 'fix-findhdf5-definitions' into release Merge branch 'intel-gnu11-support' into release Add script to update curl from upstream Merge branch 'upstream-curl' into update-curl curl: Update script to get curl 7.50.1 Merge branch 'upstream-curl' into update-curl curl: Remove CMake-specific README Merge branch 'update-curl' into release VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset Merge branch 'vs14-debug-enum-older-toolsets' into release Merge branch 'update-cle-version-info' into release GetPrerequisites: Fix regression in gp_resolved_file_type Merge branch 'GetPrerequisites-fix-regression' into release Fortran: Fix .mod file comparison for Intel 16 format Merge branch 'intel-fortran-mod-diff' into release Merge branch 'vs-NsightTegra-empty-version' into release VS: Fix VS 2015 .vcxproj debug setting for v80 toolset Merge branch 'vs14-debug-enum-older-toolsets' into release FindHDF5: Fix regression in providing HDF5_IS_PARALLEL Merge branch 'FindHDF5-is-parallel' into release FindHDF5: Fix regression in finding hdf5hl_fortran Merge branch 'FindHDF5-fix-hl-fortran' into release curl: Backport certificate reuse fix from 7.50.2 Merge branch 'backport-curl-fix' into release CMake 3.6.2 Chuck Atkins (2): FindHDF5: Make sure compile definition vars keep the -D flag CrayLinuxEnvironment: Add alternative methods to get version info Curl Upstream (2): curl 2015-08-11 (1a7f66a3) curl 2016-08-03 (f2cb3a01) Fujii Hironori (1): VS: Fix out-of-bounds write on empty Nsight Tegra version Konstantin Sinitsyn (1): FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.1, created. v3.6.1
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.6.1 has been created at 25682140a9473569fafeb10c7bbc757c6874b690 (tag) tagging f59513140bf086eda2029c5b4e950fc58216c06e (commit) replaces v3.6.0 tagged by Brad King on Fri Jul 22 09:29:41 2016 -0400 - Log - CMake 3.6.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXkh/FAAoJEC0s7xA0khaEqxUP/ijSwsbiY7HFp+w3is5AhAFd SZHEE+pTvFuKrebOw1zpnCo4jU1jGfq9bmQtDhiKOGDhq1a5M18d4qVNmA3Gn/QP O3z/BxmSQhBTnpsP726NlliQS+/JqkZOICTB00IeXUw0m6TuigdwQ0UDntwedxCh QSWDf2VJjzM+yBUkpVhtZVEyuWOW52P/OzaGJX9cTV+wrac2uQ/iQ0CmdBPJkUKG qE+dHt4rJ6zJA25RQwWw183x+rncRrT6ZvsK7L1s6vR+rPpZvfiY69RdCfTREsc4 So3/+XP4jJAsE7J33SeRlurJMJ57N7Cub3TYMdedOrONu8kfyZIm9jqrrjqTsgJ6 mjAHaS9OszTkkp/X68eyUJn/joDGOW61O29tXPfxPiVH3mIP4oPpohRyucaimT4D q5drcg/+lwPL7Zr++puy47GibWBNHtzewt8BNapkoJDfvSOBuCA6fIgiCzMtogkv zyfHjsjLcVvETAoDKiNJK5dm3y4hy3MBTUCW2gk3T+lgfiIvwalaULj+0XPgSlG6 06QD9mOd8720JkI3IlFA+IZqrqpSw2QtIwzzm0v1qyjxirl/5AJrsmeAFmAKZWH7 PCVKaexP2HZGYYFkyx75NoC2FUD0m89gTmHcI/+s9NGB5OmJVfPvA+lqHdfsPU03 0Q4AkDoNV308PKM0lyxv =9lRt -END PGP SIGNATURE- Alex Turbov (1): CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable Brad King (14): Restore find_(library|file|path) search of PATH itself Merge branch 'find-command-restore-PATH-on-unix' into release Merge branch 'fix-cpack-rpm-different-package-names' into release Merge branch 'FindHDF5-fix-misc-issues' into release VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986) Merge branch 'vs14-debug-enum-older-toolsets' into release Ninja: Do not force response files when no sysconf(3) limit is used Merge branch 'ninja-no-accidental-rsp' into release CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release Autogen: Revert changes to generate moc/rcc in subdirectories Merge branch 'nsis-protect-uninst-exec' into release Merge branch 'revert-autogen-subdirs' into release CMake 3.6.1 Chuck Atkins (3): FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac FindHDF5: Properly fail when required components are not found. FindHDF5: Cleanup inconsistent use of HDF5_ROOT Justin Clift (1): NSIS: Quote uninstaller path when executing it in a shell --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.0, created. v3.6.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.6.0 has been created at 99f040ea3bb9c8e10a1f3d377ddc28456498491f (tag) tagging e31084e65745f9dd422c6aff0a2ed4ada6918805 (commit) replaces v3.6.0-rc4 tagged by Brad King on Thu Jul 7 12:51:58 2016 -0400 - Log - CMake 3.6.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXfoiuAAoJEC0s7xA0khaEQQcP/i/IB2BXAI848r1HFnyXGjcR Irjf3ORcb+ssYFCUX1fr9UrU4t5ocVJkWDV0tV4ILXH0uoO/cv5TmDqqulhRpEa0 nRJwMGKMcg/K5kA9xnYAHpQZ844ZukeiKHjcrcVFcG5JPgjleO06OC6uAoW1m4E9 M+AiRPex1fIwN45jxpQqudjpaIRF+BqyeiMYuTkZWq1ILoJrHEFKTHMaDqWFGM21 AUVhWjPuT0zGYGNpCrg1hMM2bW0SKXC6Psd8Q1ITkvp3Mu5aI78msJe0aqdoKGs5 yRkHLlqebrHY+gDv3jAkgQN+ryUNgJlJdg3NZb8wspAWU05xe2XP9AMy3ZckbTXY ofxX8Ni2XJrIp7ZsuwYXR+rxD1TkFO6m7lHWhLbyV5Lvz9Hhl/33ijreRLnKwa5t i/HKDsxFJOJJoFt6AZPPysuPahfL+8KtcDn0lhijiwtLY3jQSYB9Tm6L2pk8HQFS Jf9c9+9qyajfR9N+eLodK63K6eLwnfQ6obELGA1x8bw44TnkXcYgASKx8/YXxU// hnZJl0t9IXQeqit3IPUx7bmwu8OiB8xmurj932Kf4v1LG4obY32yt2DsLETObE1l JLZ9CvvqrbCS6fZRrFghOuP8KgOf75SR+Aq0HDZYiNP81gWxXRywcG+RfLt16hEm bJaoD8RfxYJ3YDEnopeQ =i3Gb -END PGP SIGNATURE- Brad King (8): InstallRequiredSystemLibraries: Document UCRT option use case Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example Merge branch 'doc-updates' into release clang-format.bash: Fix filter-branch example documentation Merge branch 'clang-format-script' into release Merge branch 'FindJNI-ubuntu-paths' into release Merge branch 'cpack-ifw-fix-repo-attributes' into release CMake 3.6.0 Konstantin Podsvirov (1): CPackIFW: Fix attributes for Promoting Updates repository replacement O Libre (1): FindJNI: Fix support for Ubuntu 15.10 --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.0-rc4, created. v3.6.0-rc4
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.6.0-rc4 has been created at c5888b14ff23f075f73d3bf0933c5029459236f0 (tag) tagging dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab (commit) replaces v3.6.0-rc3 tagged by Brad King on Wed Jun 29 13:26:01 2016 -0400 - Log - CMake 3.6.0-rc4 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXdASqAAoJEC0s7xA0khaEdGgP/0FGgZlJBOJQN6NykMgAIFtb jd4R7xaR2970m0FsDuH+v1a75w0I2CE3SU1W/RFPJK0NBqGipUjBErF7aZDGaqpi EkXPFaSOGHDegP/eKhvWVuvP01+ush2pA18P9I7VjhllBarU+3vnHCd8Ko5y8g/U 8pzIcNTonnv3pXEUTGA0wuaKSvoZL/OmYVGlRpOMz0AJkbbMYz27tQ0bV7ojDxqx pGB9VDkvqv9B2BMUlpBBN0BHfr5d6KV7oHJO3YxKPSUH13QgoPHAn0YZ2NlEELoD Zg25dd5IlSZWHqrLzen/zN6rdj1Z+YSkG0QbwwuPw5WW6dvQpOvOVAndOaU00sG2 MgX+SoaWjbGKI38pJx+qyje+cIQmk2jNPqyz/q/pkgFP6jDIG1mF/GbvybsEF7aH +tRaNvPGynTH3l1dC356zsC/CR8OGZtcwgRgnmVMRj5HqCehSzbBTdJlArXZTNNA Vq4XKSqFwgs0lCq/No1aUwGCIda7vs6ibccMAVgm0dCbBcxnUrrQhTLHHzmtmIsj AXPg8Zk87+K86F4prCCL+yNrLgb7Bk5EErRjRmUegqMQDhUdl2wVvR5pBxudz5wU zyFkpICzRuMMlb1Rd8GVaHo9BRny8+nqI+8Q9n1xSsf6kvBPjJWoYouKaycjguAA Ztz/Trq0RU4dkuI5QJ0z =f9OZ -END PGP SIGNATURE- Bartosz Kosiorek (1): Help: Describe VERSION and SOVERSION meanings for Mach-O binaries Ben Boeckel (1): ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files Brad King (8): Merge branch 'backport-GetPrerequisites-typo' into release Merge branch 'doc-osx-versions' into release Merge branch 'FindHDF5-handle-unsuffixed' into release Merge branch 'ninja-no-rsp-for-rc' into release Merge branch 'doc-cross-reference-lang-standard-and-extensions' into release Revert "try_compile: Honor CMAKE__FLAGS_ changes" Merge branch 'revert-try_compile-config-flags' into release CMake 3.6.0-rc4 Gregor Jasny (1): Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162) Robert Maynard (5): FindHDF5: correctly add lang to each component target name. FindHDF5: Handle HDF5 builds with non-suffixed components FindHDF5: When component targets not found fallback to compiler wrappers FindHDF5: cache the correct path to the high level libraries FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake Rolf Eike Beer (1): GetPrerequisites: fix typo in comment --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.0-rc3, created. v3.6.0-rc3
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.6.0-rc3 has been created at 47ca01bf6e1a869b65be4895ebbe00973198c1f3 (tag) tagging d152ae123d1a3df456fe24f2e1a06d97083ad2d2 (commit) replaces v3.6.0-rc2 tagged by Brad King on Wed Jun 22 13:20:27 2016 -0400 - Log - CMake 3.6.0-rc3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXasjbAAoJEC0s7xA0khaERG8P/i9YEjEvhZJIJZToZPFXQy/b EVzfxdMKCbkQkmNOx4mVLUmh4iRDwQo/MeHhy6QOX6QHsTBsCDcfPBCNVY8ylucd zTOAPNUH0u69lqbdbXs68jdxHVkjHjnxgXPpThKsel2pbnslMYyPsDO38e1TNRFr 4abhKKOcHNCNHp1wI0LNwpp8N5TkXy4vQMwYC4NxyMKeyZrNAI+9ELSn/Cj6ymDj 0cGYMEbsd5WlJjH7dCECawxUDYgb0vgm6wVgZdmozBOGZmYhLXRJ7dzs+yfucQ16 i9IodZoAuek+qYqRZwKN6SbUwra0/cdwWBpirECxmO9jC8LIiBlDjJCvfOQZP5rv Khf2yOIu/qiiqBtyBKlG8sioroHU9eCqMv2gvJWb+vWr4yKS118HFtS6xdGHVxyp vfMN7YoC7pj0FsxeyRMZ5jg7b5fx95Laptjfj61A5gZC/aVmKzMsfnaIOKsejFUw 7pyidupmXZZJgSfa6Td1ajyMVrvqKBzMsxCaHDVF3Hhck4owKWXsnTwmerSG7ain NivgGo2qCAtx+Rs30HcLQ7/qOvm5TmuXH3VONtaTbZB/iNh9g+VMuY4CxHVB9AGZ /RYiN7AsZkSjv24VyYYOkRyRngNXLGc3rEcFh2IIW5N3OS+9yHj1GQOcKHGbYs+K 5Hs43gRcVLcy7C9NB67W =E7ST -END PGP SIGNATURE- Brad King (14): VS: Fix regressed mapping for the cl `/Os` compiler flag Merge branch 'revert-vs-clang-minsize' into release Merge branch 'CodeBlocks-include-order' into release README: Update Issue Tracker link to new location Merge branch 'doc-issue-tracker-move' into release FindQt4: Document Qt4::QtDeclarative imported target (#16157) Merge branch 'FindQt4-doc-QtDeclarative-imported' into release Merge branch 'pkgconfig-targets' into release Merge branch 'cpack-deb-test-fixes' into release Merge branch 'upstream-LibArchive' into update-libarchive Merge branch 'update-libarchive' into release Help: Clarify VS_STARTUP_PROJECT documentation Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into release CMake 3.6.0-rc3 Domen Vrankar (2): CPack/Deb: Fix tests for SELinux-enabled systems CPack/Deb: Fix test to actually test the preinst script LibArchive Upstream (1): LibArchive 2016-06-19 (139d0576) Rolf Eike Beer (1): FindPkgConfig: define the imported targets also when the data comes from cache Tobias Hunger (1): cmExtraCodeBlocksGenerator: Do not shuffle include directories --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.0-rc2, created. v3.6.0-rc2
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.6.0-rc2 has been created
at bb5ad4202a91fcf07b0f1ac3c2708be8dea409c3 (tag)
tagging 9f3546bbb44e23b97ea226fce155330eb352f75b (commit)
replaces v3.6.0-rc1
tagged by Brad King
on Mon Jun 13 13:37:28 2016 -0400
- Log -
CMake 3.6.0-rc2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQIcBAABAgAGBQJXXu9YAAoJEC0s7xA0khaEByIQAK19T+AkEiMl4Re0z7Zd+LZ+
t/Kt92/pMjDqnE+LkTUICV6S46MBeihe6prs+hkeFzIavvkyMbzht73fULJN1nIJ
WvOHabHQlBobE8i4TOjzQ4n9zsru/EhCveyJSWReOyzhpuhGyGnfOmE+vwD90lP6
Q8Cr9OZO+FVSUrc1jiyz5cSyoxzGpvIkUIv6dksRyx/7IrHOVpwFPP2urxeX3ahp
8XFPrgTFTD8pMgLZpN0FZ/8mnge7mwsQA/Lwf8mEkCzUy1PGjBubvnXAQKM9W7Rn
YVBZbcr8xrwxa6hmqsCwqrapxabevCDU+EvT9aU+tmPmrDr0gYWkCPhkUt/kSXSv
zaDH2O7zt6R5CmZHbcIx+KrY3wT+zuYIKsAekOuNo41j1Yogi5S+BeCDyUPkE2n4
WVZF0PBbt13bpMGTMUa0OzeZ/EmNtzPT2SRacnHf4Y+KRkJH0VNysxEFO2tphf/n
sEkq3PvucPTPfXc/WAoLi8dLsCbXGZ0GIVmksPYg89qXRmji3b3iJ3BQBapRow7p
xoWJYCtCKLKfPjvvpZwLcBxfYaOoFr0cKiPTSIqYliD5QoMuPFxp5ur1TKwRUHWc
zdMvJmpRGqC3CrGENgM3B2QYX/Csz2kfKK7aPZUUn7/rwQbqVhQGi5yV5rFc9hp4
DU3USf5fm9xIoa85N7uZ
=nDiX
-END PGP SIGNATURE-
Brad King (12):
Merge branch 'FindLibArchive-3.2' into release
Merge branch 'SunOS-PathScale' into release
Merge branch 'upstream-expat' into update-expat
Merge branch 'update-expat' into release
libarchive: Restore OpenSSL include directory from upstream
Merge branch 'fix-libarchive-openssl-no-hashes' into release
Help: Document ctest_update branch following behavior
Help: Document CTest Git fetch-and-reset behavior
Merge branch 'doc-ctest_update' into release
Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into release
Merge branch 'bash-completion' into release
CMake 3.6.0-rc2
Eric NOULARD (4):
bash-completion: Add cmake --help-manual
bash-completion: Fix cmake --help-policy lookup
bash-completion: Add ctest --help-{manual,module,policy,property,variable}
bash-completion: Add cpack --help-{manual,module,policy,property}
Expat Upstream (1):
expat 2016-06-05 (2b9cb7f5)
Michał Górny (1):
Platform: add flag definitions for PathScale compiler on SunOS (#16135)
Orion Poplawski (1):
FindLibArchive: Support libarchive 3.2 version string format
Robert Maynard (1):
cmake-gui: Teach Qt5 where plugins are when launched through a symlink
---
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.0-rc1, created. v3.6.0-rc1
:
FindJNI: Add support for Ubuntu 15.10
FindJNI: Append path only "if(EXISTS"
Patrik Lehmann (1):
Eclipse: Implement traversal of nested source groups (#15701)
Paweł Stankowski (2):
Add support for Bruce C Compiler (BCC)
TestBigEndian: Log success to CMakeOutput.log, not CMakeError.log
Philippe Proulx (1):
Add FindLTTngUST module to find LTTng-UST library
Reiner Herrmann (1):
file: Sort GLOB results to make it deterministic (#14491)
Robert Goulet (1):
Xcode: Refactor block writes to allow any level of nesting
Robert Maynard (4):
Features: Specify minimum version Intel C++ 12.1
Features: Record standards and features for Intel C on UNIX
WCDH: Add Intel to list of supported compilers
Make packaging script wait for the disk image to be mounted.
Roger Leigh (3):
FindBoost: Define Boost::boost for all boost versions
FindBoost: Update dependencies for Boost 1.61
FindBoost: Add checks for component-specific headers
Rolf Eike Beer (6):
cmMakefile::AddCacheDefinition: avoid conversions between char* and string
cmGlobalXCodeGenerator: directly call CreateString() with std::string
make cmGlobalXCodeGenerator::BuildObjectListOrString::Add() take a string&
make cmGlobalXCodeGenerator::XCodeEscapePath() take a std::string&
cmGlobalXCodeGenerator: do not pass char* to
cmSystemTools::CollapseFullPath()
FindPkgConfig: optionally create imported target for the found libraries
Roman Wüger (1):
BundleUtilities: Add optional parameter to ignore specified files
Ruslan Baratov (6):
ExternalProject: Use uppercase placeholders for script generation
ExternalProject: Remove unused 'retries' argument from verify script
ExternalProject: Remove unused verify script logic
ExternalProject: Avoid repeating download verification
ExternalProject: Re-implement download verification as a dedicated script
ExternalProject: Re-implement download logic as a dedicated script
Samir Benmendil (1):
ExternalProject: Allow TLS_VERIFY for git clones
Sean McBride (1):
Drop unnecessary LSRequiresCarbon reference from Info.plist files
Sebastian Holtermann (16):
Autogen: Use SystemTools string functions instead of rolling out own
Autogen: Rename header extension Join method to JoinExts
Autogen: New logCommand method. It prints commands using std::cout.
Autogen: Rename method GenerateQrc{ => Files}
Autogen: Split out moc file generation code to dedicated method
Autogen: Split out UI file generation code to dedicated method
Autogen: Ui processing: Generate single map with final input / output
names
Autogen: Qrc processing: Generate single map with final input / output
names
Autogen: Check added for name collisions of generated moc files
Autogen: Check added for name collisions of generated ui_NAME.h files
Autogen: Check added for name collisions of generated qrc_NAME.cpp files
Autogen: Generate not included moc files in subdirectories (#12873)
Autogen: Generate qrc_NAME.cpp files in subdirectories
Tests: QtAutogen: Same source name in different directories test
Autogen: Message cleanups: Compose messages in std::stringstream
Autogen: Message tweaks: Compiler type (moc/qrc/ui) added to progress
messages
Sebastian Schuberth (1):
cmake: Teach --build to reject multiple --target options
Sergiu Deitsch (1):
CMakePackageConfigHelpers: allow to specify a relative
CMAKE_INSTALL_PREFIX
Stafen Teleman (1):
Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)
Taylor Braun-Jones (4):
VS: Improve unit test macros
VS: Fix default target support for targets nested inside a folder
VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDER
cmake-mode.el: Make cmake-tab-width a customizable variable
Tobias Hunger (3):
cmListFileCache: Fix warning about inconsistent use of class/struct
cmSearchPath: Fix typo in comment
cmSourceFileLocation: Fix typo in comment
Wayne Stambaugh (1):
FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths
Zack Galbreath (8):
More options for CTestCoverageCollectGCOV
CTest: Optionally use a secondary test timeout after matching output
CTest: Only apply the secondary test timeout once
cmParseCoberturaCoverage: Remove extra coverage line
CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
CTestCoverageCollectGCOV: Honor CTEST_EXTRA_COVERAGE_GLOB
CTestCoverageCollectGCOV: Improve documentation
CTestCoverageCollectGCOV: improve DELETE option
Zak Eckert (1):
FindGTest: Automatically re-run cmake when tests change
---
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.5.2-1500-g89e30ba
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 89e30ba9b52013cf8cb923942e205be4a4354784 (commit)
via d3812437036e95329fbee0773282b88e8b013fbe (commit)
from 0a67a1180fc50eade5a753c8c2ec994865084eb7 (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=89e30ba9b52013cf8cb923942e205be4a4354784
commit 89e30ba9b52013cf8cb923942e205be4a4354784
Merge: 0a67a11 d381243
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu May 19 11:43:16 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu May 19 11:43:16 2016 -0400
Merge topic 'make_osx_packaging_more_robust' into next
d3812437 Make packaging script wait for the disk image to be mounted.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3812437036e95329fbee0773282b88e8b013fbe
commit d3812437036e95329fbee0773282b88e8b013fbe
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu May 19 11:41:48 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Thu May 19 11:41:48 2016 -0400
Make packaging script wait for the disk image to be mounted.
Frequently the apple script would execute before the disk image had been
fully mounted, and would fail. We now try to wait for the disk to be
mounted first.
diff --git a/Packaging/CMakeDMGSetup.scpt b/Packaging/CMakeDMGSetup.scpt
index c7ddcfb..37e7bd1 100644
--- a/Packaging/CMakeDMGSetup.scpt
+++ b/Packaging/CMakeDMGSetup.scpt
@@ -4,6 +4,21 @@ on run argv
tell application "Finder"
tell disk image_name
+-- wait for the image to finish mounting
+set open_attempts to 0
+repeat while open_attempts < 4
+ try
+open
+ delay 1
+ set open_attempts to 5
+close
+ on error errStr number errorNumber
+set open_attempts to open_attempts + 1
+delay 10
+ end try
+end repeat
+delay 5
+
-- open the image the first time and save a DS_Store with just
-- background and icon setup
open
@@ -12,7 +27,7 @@ on run argv
set background picture of theViewOptions to file
".background:background.tif"
set arrangement of theViewOptions to not arranged
set icon size of theViewOptions to 128
- delay 1
+ delay 5
close
-- next setup the position of the app and Applications symlink
@@ -28,7 +43,7 @@ on run argv
set position of item "Applications" to { 378, 200 }
end tell
update without registering applications
- delay 1
+ delay 5
close
-- one last open and close so you can see everything looks correct
---
Summary of changes:
Packaging/CMakeDMGSetup.scpt | 19 +--
1 file changed, 17 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, next, updated. v3.5.2-1108-gb3f7515
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 b3f751575385969e808fdaf45de09958822d5b1a (commit)
via 21e2814ab5411d9f0e14e52fe12c7a3405cbee9b (commit)
from e4ce56bf57e165763dc206ff0b79d91d256548f1 (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=b3f751575385969e808fdaf45de09958822d5b1a
commit b3f751575385969e808fdaf45de09958822d5b1a
Merge: e4ce56b 21e2814
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Wed Apr 27 16:36:16 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Apr 27 16:36:16 2016 -0400
Merge topic 'intel-compiler-features' into next
21e2814a Features: Specify minimum Intel version to 12.1 for C and C++.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21e2814ab5411d9f0e14e52fe12c7a3405cbee9b
commit 21e2814ab5411d9f0e14e52fe12c7a3405cbee9b
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Wed Apr 27 15:28:33 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Wed Apr 27 16:33:34 2016 -0400
Features: Specify minimum Intel version to 12.1 for C and C++.
Versions below 12.1 don't provide enough information to properly detect
if compiling with c++98 or c++0x enabled so remove them from the
supported list.
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index cfd7421..eb9602a 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -19,14 +19,14 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
endif()
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=c89")
set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=c99")
endif()
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
if (NOT CMAKE_C_COMPILER_FORCED)
if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
@@ -51,7 +51,7 @@ macro(cmake_record_c_compile_features)
set(_result 0)
if (NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" AND
- NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+ NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
_get_intel_c_features(${CMAKE_C11_STANDARD_COMPILE_OPTION}
CMAKE_C11_COMPILE_FEATURES)
endif()
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index d328e3c..e111c07 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -12,7 +12,7 @@ endif()
#set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}")
#set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}")
-set(_cmake_oldestSupported "__INTEL_COMPILER >= 1110")
+set(_cmake_oldestSupported "__INTEL_COMPILER >= 1210")
set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__)
|| defined(__GXX_EXPERIMENTAL_CXX0X__))")
#ICC version 15 update 1 has a bug where __cplusplus is defined as 1 no matter
#if you are compiling as 98/11/14. So to properly detect C++14 with this
version
@@ -71,30 +71,26 @@ set(_cmake_feature_test_cxx_range_for "${Intel13_CXX11}")
# Cannot find Intel documentation for N2640: cxx_uniform_initialization
set(_cmake_feature_test_cxx_uniform_initialization "${Intel13_CXX11}")
-set(Intel121_CXX11 "__INTEL_COMPILER >= 1210 && ${DETECT_CXX11}")
+set(Intel121_CXX11 "${_cmake_oldestSupported} && ${DETECT_CXX11}")
set(_cmake_feature_test_cxx_variadic_templates "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_alias_templates "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_nullptr "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_trailing_return_types "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_attributes "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_default_function_template_args "${Intel1
[Cmake-commits] CMake branch, next, updated. v3.5.2-957-g16ef561
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 16ef561aad415cff24c23f12aaf598483d188f3c (commit)
via 3ac4cb61b61b26a7d5041ddd0918d6db60469535 (commit)
from 14261ea2d15d0d91f4bca3afc40d28a45687234d (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=16ef561aad415cff24c23f12aaf598483d188f3c
commit 16ef561aad415cff24c23f12aaf598483d188f3c
Merge: 14261ea 3ac4cb6
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Fri Apr 15 14:04:40 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Apr 15 14:04:40 2016 -0400
Merge topic 'intel_compiler_feature_detection' into next
3ac4cb61 Add C_STANDARD support to Intel C compilers
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac4cb61b61b26a7d5041ddd0918d6db60469535
commit 3ac4cb61b61b26a7d5041ddd0918d6db60469535
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Fri Apr 15 13:40:30 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Fri Apr 15 14:03:23 2016 -0400
Add C_STANDARD support to Intel C compilers
diff --git a/Modules/Compiler/Intel-C-FeatureTests.cmake
b/Modules/Compiler/Intel-C-FeatureTests.cmake
new file mode 100644
index 000..bc40f69
--- /dev/null
+++ b/Modules/Compiler/Intel-C-FeatureTests.cmake
@@ -0,0 +1,20 @@
+# References:
+# -
https://software.intel.com/en-us/articles/iso-iec-standards-language-conformance-for-intel-c-compiler
+# - https://software.intel.com/en-us/articles/c99-support-in-intel-c-compiler
+# - https://software.intel.com/en-us/articles/c11-support-in-intel-c-compiler
+
+set(_cmake_oldestSupported "__ICC >= 1110")
+
+set(DETECT_C99 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(DETECT_C11 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
+
+set(Intel_C90 "${_cmake_oldestSupported}")
+set(Intel_C99 "${_cmake_oldestSupported} && ${DETECT_C99}")
+set(Intel_C11 "__ICC >= 1500 && ${DETECT_C11}")
+
+
+set(_cmake_feature_test_c_static_assert "${Intel_C11}")
+
+set(_cmake_feature_test_c_restrict "${Intel_C99}")
+set(_cmake_feature_test_c_variadic_macros "${Intel_C99}")
+set(_cmake_feature_test_c_function_prototypes "${Intel_C90}")
\ No newline at end of file
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 77363eb..16d68a2 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -8,5 +8,61 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_C "-MD -MT -MF ")
+if (WIN32)
+ set(_std -Qstd)
+else()
+ set(_std -std)
+endif()
+
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
+ set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
+ set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
+endif()
+
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+ set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
+ set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
+ set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
+ set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
+endif()
+
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+ if (NOT CMAKE_C_COMPILER_FORCED)
+if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
+ message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
+endif()
+set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
+ elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT)
+# Compiler id was forced so just guess the default standard level.
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
+ set(CMAKE_C_STANDARD_DEFAULT 11)
+else()
+ set(CMAKE_C_STANDARD_DEFAULT 90)
+endif()
+ endif()
+endif()
+
+unset(_std)
+
+
+macro(cmake_record_c_compile_features)
+ macro(_get_gcc_features std_version list)
+record_compiler_features(C "${std_version}" ${list})
+ endmacro()
+
+ set(_result 0)
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
+_get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION}
CMAKE_C11_COMPILE_FEATURES)
+ endif()
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+if (_result EQUAL 0)
+ _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION}
CMAKE_C99_COMPILE_FEA
[Cmake-commits] CMake annotated tag, v3.5.2, created. v3.5.2
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.5.2 has been created at af09fcc6bc927b79916c92d19cfb221b506dc7f0 (tag) tagging 80bcbe2d85232d748e31fb4de1016af60788505d (commit) replaces v3.5.1 tagged by Brad King on Fri Apr 15 08:58:40 2016 -0400 - Log - CMake 3.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXEOWBAAoJEC0s7xA0khaEH60P/jeuTa0o1HcEIvRxH0+Eu5c2 QcXwQB6hEpqKXJriYC6RStnEh3Dv5DPiBr4OBK2383u23RlP5s4/V/gkWw/+XVMQ 0fXCndkqoSIla4DObhbGe9lzxZRZH2TUymAAS6um7jjL/8788dBe6zqJ/BeKa7Lp Ua6khhhChVSzNiMzpn5/v6OLpGKvaDQkQP9YbiMRIzH9VipL2i0NoTEK9TRmtY11 ULbcZPCTKRowI7tQnlNlgTD6BKzxrq+8Ewffh8fjbVizDtv3CAFclvbjWjXPiU/2 TUcd+3GtObikpWtJ/TL3RTXnJx41Gf9PrA7PKS+XqCxX9lWn+23gY+hftbcxduWl 43rySfOS+4SFritSuwjqz5cmejyURdTCwuVKEstvh7yomqY0PBrb2FOmqGnHCcCO x8lOxTiWqgTMKp5LSHIV9jFHJEKWJH5o74Nce9+W7W8O0zcqoBYWDAUahfqIkYYZ E3mu53PIyNbh/PosY04c8bSC045RTy1bIhHatZBeJGaqK9RVM4J+FoiCcYSg0Bo2 qZBWJ3bnE8OpHNFWtW6ZsbP13by9JjKQMOiWwSwG08CU2ZKUpKpybcRCbB6oHzce yG7zekmCmQ8JGiwVul6LiXX35BSbOToPTj2in7rPcG3faOYhndaOTIqi3SmB0EsC TMj8JbETK9JXK9OAGC5F =SIXK -END PGP SIGNATURE- Brad King (12): Merge branch 'xcode73-xctest-location' into release Merge branch 'backport-asm-includes' into release Fix lookup of an ALIAS target outside aliased target's directory (#16044) Rename local target lookup methods to clarify purpose Merge branch 'fix-target-alias-in-subdir' into release Merge branch 'FindGSL-doc-typo' into release cmFortranParser: Skip #line directives that do not name files Merge branch 'fortran-line-directives-no-dirs' into release Ninja: Fix detection of custom command symbolic outputs Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049) Merge branch 'ninja-restat-custom-command-byproducts' into release CMake 3.5.2 Gregor Jasny (2): Xcode: Fixup XCTest bundle location for Xcode 7.3 ASM: Add missing placeholder for "compile" rules Pierrick Koch (1): FindGSL: Fix typo in documentation --- 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.5.1-932-g9f42343
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 9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c (commit)
via 3dcd7eded5682de6f92ceb4efc82c65ba5827941 (commit)
via 66594ff3baf0c358e639f703b3e2b7776d9becbd (commit)
via 003d4e57521a876b7340ed164a737d99eabb164d (commit)
from ee786eaf3e502aeadc0e1b2913cf26fd0ec451a8 (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=9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c
commit 9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c
Merge: ee786ea 3dcd7ed
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Fri Apr 15 08:20:18 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Apr 15 08:20:18 2016 -0400
Merge topic 'intel_compiler_feature_detection' into next
3dcd7ede Add Intel to list of supported compiler for feature detection.
66594ff3 Add CXX_STANDARD support to Intel C++ compilers
003d4e57 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dcd7eded5682de6f92ceb4efc82c65ba5827941
commit 3dcd7eded5682de6f92ceb4efc82c65ba5827941
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Thu Apr 14 08:57:07 2016 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Thu Apr 14 15:48:02 2016 -0400
Add Intel to list of supported compiler for feature detection.
diff --git a/Help/manual/cmake-compile-features.7.rst
b/Help/manual/cmake-compile-features.7.rst
index caf5bac..84c6bca 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -309,3 +309,4 @@ versions specified for each:
* ``GNU``: GNU compiler versions 4.4 through 5.0.
* ``MSVC``: Microsoft Visual Studio versions 2010 through 2015.
* ``SunPro``: Oracle SolarisStudio version 12.4.
+* ``Intel``: Intel compiler versions 14.0 through 16.0
diff --git a/Modules/WriteCompilerDetectionHeader.cmake
b/Modules/WriteCompilerDetectionHeader.cmake
index a3b73bb..2669a84 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -36,7 +36,7 @@
# PREFIX ClimbingStats
# OUTPUT_FILES_VAR support_files
# OUTPUT_DIR compilers
-# COMPILERS GNU Clang MSVC
+# COMPILERS GNU Clang MSVC Intel
# FEATURES cxx_variadic_templates
#)
#install(FILES
@@ -100,7 +100,7 @@
#write_compiler_detection_header(
# FILE climbingstats_compiler_detection.h
# PREFIX ClimbingStats
-# COMPILERS GNU Clang AppleClang MSVC
+# COMPILERS GNU Clang AppleClang MSVC Intel
# FEATURES cxx_variadic_templates
#)
#
@@ -323,6 +323,7 @@ function(write_compiler_detection_header
AppleClang
MSVC
SunPro
+Intel
)
set(_hex_compilers ADSP Borland Embarcadero SunPro)
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index c538280..c3f5b4c 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -11,7 +11,7 @@ get_property(c_known_features GLOBAL PROPERTY
CMAKE_C_KNOWN_FEATURES)
write_compiler_detection_header(
FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h"
PREFIX TEST
- COMPILERS GNU Clang AppleClang MSVC SunPro
+ COMPILERS GNU Clang AppleClang MSVC SunPro Intel
VERSION 3.1
PROLOG "// something"
EPILOG "// more"
@@ -78,6 +78,13 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
endif()
endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+ list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
+ list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
+ set(true_defs "")
+endif()
+
+
if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
@@ -104,7 +111,7 @@ write_compiler_detection_header(
PREFIX MULTI
OUTPUT_FILES_VAR multi_files
OUTPUT_DIR
"${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support"
- COMPILERS GNU Clang AppleClang MSVC SunPro
+ COMPILERS GNU Clang AppleClang MSVC SunPro Intel
VERSION 3.1
FEATURES
${cxx_known_features} ${c_known_features}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66594ff3baf0c358e639f703b3e2b7776d9becbd
commit 66594ff3baf0c358e639f703b3e2b7776d9becbd
Author: Levi Morrison <morrison.l...@gmail.com>
AuthorDate: Mon Nov 16 09:19:30 2015 -07
[Cmake-commits] CMake annotated tag, v3.5.1, created. v3.5.1
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.5.1 has been created at 22da5dc5346a084bebe512eb43365460d53188ac (tag) tagging 64130a7e793483e24c1d68bdd234f81d5edb2d51 (commit) replaces v3.5.0 tagged by Brad King on Thu Mar 24 12:42:14 2016 -0400 - Log - CMake 3.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJW9BjmAAoJEC0s7xA0khaE7qgP/26J6KhQcLaxc010HuFZOPwz EDJTGSBRdfisUdXDBKWdHMJ1LmFWAICbCzMvHsdGwICeRS9LeRlNyQ8RN2u/Wi9h NFC2DgNSfT3/Sk1ZoKk7/hSSqgnnYZp86J4f+2Xo1ArgBVJI52EpsIw0uyoviZyh 0bOrJ3Jpe9I9pQNyXHliO0GSQwvPCB1U1y85z9M/60IuMLFuozE0j9XLTDzVUEud Ow4wz/va4/N51b2rkQM42+m5nRQ1Hy5xhVCo10n+snwj/ZR51laxBbLqWZAzqs3c y50+p4cDRSzAXRGcBdJhzm3ndDs8hFSCjbB2uUva4vcDVgqrichKFzOkMZNtbSy+ pRfuBqdV4k+B2qHIFTMU9h4Q5pSHveHaF/RyBMJBbbApiCxzsguA67SWcM6o792X HS1BQEkxj9OFECSEnOF03+A3rVU5tO0qsKgnw0iXlBiIIZ0xOBVkGAx0/9Ew1nWV pNY8VLGBIDOoX+w2/0h4lHiLu0TIRoXRVxb9ngwIv8oWjUc4SAAbMiWbVJGfAnws xkTty+/8vRIWsedJP+deIl2kXGvUus8W7qufS6VIyK22vb1L16uqD4IzPEU++p7V m3VdjAN4y+8ZwnQbi8lKQkSOnDy/21vIA2ZZ0FuRwjYGtUBUFFFXev7JyW3RPCy5 qx3fzuFq78LFKEvy+I3j =icPY -END PGP SIGNATURE- Ben Boeckel (1): FindPkgConfig: set correctly named variables in cache (#15903) Brad King (12): Merge branch 'FindBoost-optional-indirect-depends' into release Merge branch 'ios-install-combined-one-arch' into release Merge branch 'cpack-osx-no-carbon' into release cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023) Merge branch 'cmake-gui-osx-identifier' into release CPack: Avoid using OS X CoreServices if compiler fails on header (#16021) Merge branch 'cpack-osx-optional-CoreServices' into release Merge branch 'fix-repeat-pkg-config' into release FindCUDA: Fix regression in separate compilation (#16027) Merge branch 'FindCUDA-verbatim' into release Merge branch 'fix-variable_watch-reallocation' into release CMake 3.5.1 Roger Leigh (1): FindBoost: Tolerate missing indirect dependencies (#16013) Ruslan Baratov (1): Fix iOS combined feature for single architecture targets Sean McBride (1): CPack: Avoid requiring Carbon framework on OS X (#16021) Yves Frederix (1): Avoid occasional use-after-free when a variable watch is executed --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.5.0, created. v3.5.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.5.0 has been created
at 7d39803575a7b233e1780820d19b42aecad92cfe (tag)
tagging b369959eb55dbea601315530185cb480c922cc77 (commit)
replaces v3.5.0-rc3
tagged by Brad King
on Tue Mar 8 10:44:52 2016 -0500
- Log -
CMake 3.5.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQIcBAABAgAGBQJW3vN0AAoJEC0s7xA0khaEFKAP/jG7h0nD0Nbr7a9xXwLvRsNZ
ZPih+AU8LDvyQt02raxEOKqPYFQw6kxYVpB7oIwFRgwloa54Nzr4QL1oZq7tjHzc
yQE+/mRlMLZ7x074pbEUH0EH0+rcjE0XfcORItV2VUQnolDnuuu+sbzfFqAjHtOV
CpHHVIEwWEucXAGnn8zd51FHc2LUzLiCc9UehhAZOHj8kDgtjaihza7yFKreSpb2
SUPZjs5ihCdqAnrTzxOavQB8o8i9FEbq+DrGq5Ti0YML9rf2W2XjeCfvdp2bSXAg
UtlNxncRBBobAblrBWmH43Eq5iRXYy9RcCUYTtJ1yqx0XciXcgbZeZkcv7rblX1p
N4vGWygZ1caax/EBWdn1EsKOpgdtqldmZDpOrC6eVU1h6XmaSXzEHqfRNIltfdmO
IYz2nPdvIa8bsnFlVRtM2bgySVyNYQInALzceyJRg+1EoDfKv3FsmSVLjYOdWXRv
G6LNhVBp4Qp4aagIL3l/7jGHydPD7rXHZFvuKXIB+22jaD6dJl08x5VKpUILd0mV
XsDRg8PmRKp1TtcLlT5wRTYJO+cIexfMLdbH7qK1mk3jswAdk3KlFIbl4zkJOfz1
j3C9LpZ/n81KwAZmUZSj4je21C5gHyP7caY5OGa9cK+NiBArvJkfUJLEM1y8+2pc
J8yaJ8t0aOV5x43rCwSp
=77Bk
-END PGP SIGNATURE-
Ashley Whetter (1):
Help: Fix typos in cmake-packages.7 manual
Bartosz Kosiorek (1):
Help: Clarify `cmake -E` command behavior with respect to file existence
Brad King (7):
Merge branch 'doc-cmake-E-details' into release
Merge branch 'doc-typos' into release
VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)
Merge branch 'vs14-debug-enum-older-toolsets' into release
FindPython{Interp,Libs}: Clarify recommended call order
Merge branch 'doc-find-python-call-order' into release
CMake 3.5.0
---
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.5.0-rc3, created. v3.5.0-rc3
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.5.0-rc3 has been created at b8153f126b5ff4f140008bd1050d8ed66b330545 (tag) tagging d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 (commit) replaces v3.5.0-rc2 tagged by Brad King on Thu Feb 18 13:40:45 2016 -0500 - Log - CMake 3.5.0-rc3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWxhAtAAoJEC0s7xA0khaE8sQQAJkrr5mbX71yvHGIuv6fWOL2 66dl1YTYOEyWxj83v4H45iJhyeNbje4w/r6WDBpfkpCzqNIVnVGjzNPE1IrbK/lL xkrvbnpH8jnIRcTZmq/G6RVisTB7/neOLNpieDHFnaDuKD9mM0MwO1IqmJCbXkTD tFP9hO6DWwyshi295IxOTfjpDPZbAXexSe4Qt4oB39Ak8rMo9vyeEoS+8a+swPJc vX4UE4+NkporSdWZWlkcuGOK9F5U83HKnFfGtk9DUaMuLP7IoHYnJY9R6LSVt1Gg YXEKhJw4KRcRb9yjpJcTnLccaS3Hs3Dr6mWTZe3DBNsinlRgK9lEl5X3arlsem+8 yzdxdl3XgzFMC3nGqHR8HvpmNr5ap+rfU4UTVERLtawB+zfOgjrjcld1XoxICOeq RPlLP8kuM291XMayGKODCO5OpTcWnOkyAwPMM8I0V6AKwEoz/bIWXz6bSb0gIbNM r9y1KsHuBVxBsz4Eobhh529F9pMt9jKhGpslYSTxIFrhTpOEo8oFvcKXROMM/4lX r3E9zbv6HEfh03werJRdJJxpTjAcJcMHAT4+Xrpmj6D/8HL4UDQYAanEmFMWB1FP bOxfGR9c/mMyTN0Q82k8JNSkx9wl6wt1hl/RHIhKYGCevUouK1n30Y/unTJD5RwT eZvYg7KtWtpDOMc+kIc4 =xT6p -END PGP SIGNATURE- Brad King (14): Help: Add release note about Xcode escaping fix (#15969) Merge branch 'doc-xcode-escaping-fix' into release cmake-gui: Fix cmState initialization when changing generators (#15959) Merge branch 'cmake-gui-reset-generator' into release Merge branch 'fix-cmake_parse_arguments-expansion' into release CMakeForceCompiler: De-deprecate until more use cases have alternatives Merge branch 'de-deprecate-CMakeForceCompiler' into release Help: Clarify install(TARGETS) INCLUDES DESTINATION option Merge branch 'backport-doc-install-component-association' into release Fix export of STATIC library PRIVATE non-target dependencies Merge branch 'fix-static-private-non-target-depends' into release FindCUDA: Fix regression under Visual Studio generators Merge branch 'FindCUDA-verbatim' into release CMake 3.5.0-rc3 Dimitar Yordanov (1): cmake_parse_arguments: Restore ;-list argument flattening --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.5.0-rc2, created. v3.5.0-rc2
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.5.0-rc2 has been created at a8227079ea35fe5ef8689319e43029d71bd25e4a (tag) tagging 8d1b37a2b207956c05e017645de3681a077d0a5b (commit) replaces v3.5.0-rc1 tagged by Brad King on Wed Feb 10 14:20:52 2016 -0500 - Log - CMake 3.5.0-rc2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWu42UAAoJEC0s7xA0khaE2XEP/1XgY7egloMXA64+UVJREwTx C5oz+l50c7FGJmCU0jGJP//eAsolutFeVA+zIBKo2JWm6OcP7/RAhYtzvlT1dvis csQL3xy7ubNoezey3qo3UIhev4obZ8LZzqrJdPzI8OibqGi+IRDOvZXwQWD5zAbX r7vOVK542o/Jb0AyRxlwdxlVHWMJXOXUB/+nbtCJuBZVWxsk9p78pGLTnWtpztc1 EYvnP6xb/TSc2sOlp3qzJbNcGBPQt58DBzXkLiCKo/UW9jYtIykKHM+BOqK+jC7d 1UuBNvxGS913eK3UJDtj7k5GbPqL22HS9lwxWqjMiQWL9yQ3Y8MXAbCis9Vq6DjK hgwYZaNvEYuOvBLc6l0naunq4MJIIT1DwvZDD4raeUBMJnJckmFWwp0C5D06tB0x sY5Ihgmcr4d5ezgwx/p5p3nooND6nWRMqzaeo+GNNSwhAPaf7dsd6BTj8wHsOdQL 98GkGFtbXS1beSkxP/aSk8ClhfI1RgI69nt7OpdrZ/QIMYvUCt6UXn8CzpbfCduM RsxMoI/NxtNe4oj4jUGohJJ4vabydcsB42hi85grD3+HPjwemf0Yx0NCXLm/sIb/ rIyYxUGRUEwAYUcK5VHOMKdocTB0Tbifx3hnmdAIPv/LxnPHq5rsIye0qscH++PW PxBPbaoNrK+SsynCCOY0 =wbBG -END PGP SIGNATURE- Brad King (19): Fix dependency scanning configuration in subdirectories Tests: Use newer policy settings in RunCMake.install test install(EXPORT): Fix crash on target in another directory ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957) Merge branch 'fix-Fortran-module-in-subdir' into release Merge branch 'ExternalProject-build-config-compat' into release Merge branch 'fix-doc-typos' into release Merge branch 'install-man-conditionally' into release Merge branch 'test-ctest_submit-update' into release Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test Merge branch 'fix-install-EXPORT-crash' into release Fix internal target lookup performance regression Improve internal generator target structure lookup Merge branch 'fix-target-lookup-performance-regression' into release Merge branch 'wix-prevent-nsis-overwrite' into release cmCurl: Fix compilation with system curl versions prior to 7.21.5 Merge branch 'curl-pre-7.21.5' into release CMake 3.5.0-rc2 Horst Kronstorfer (1): Help: Fix command specification for cmake_minimum_required Nils Gladitz (1): CMake: Prevent WiX installations over existing NSIS installations Orion Poplawski (1): Tests: Extend ctest_submit host lookup failure matching (#15958) Paul Wilkinson (1): Help: Fix mistake in cmake-buildsystem(7) example --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.5.0-rc1, created. v3.5.0-rc1
warnings by default.
Refactor the -W options parser to be generic.
Add -W options to control deprecated warning messages.
Consistent documentation for deprecation message variables.
Modify dev warning options to affect deprecated warnings.
Explicitly enable deprecated warnings by default.
cmake-gui: Add options to control warning messages
cmake: Deduplicate warning message control code
Add -Werror and -Wno-error command-line options
cmake-gui: Add options to control warning-as-error messages
Mike Fitzgerald (1):
VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)
Milian Wolff (5):
Remove temporary allocations when calling cmGeneratorTarget::GetName.
Remove temporary allocations by extending the lifetime of the retval.
Remove temporary allocations in cmMacroHelper::InvokeInitialPass.
Optimize cmMakefile::ExpandVariablesInStringNew.
Remove temporary allocations when calling cmHasLiteral{Suf,Pre}fix.
Niels Ole Salscheider (1):
QtDialog: Add option to control XDG file install destination
Nils Gladitz (6):
CPackWIX: Handle text nodes in XML patch content
CPackWIX: Don't allow users to deselect the top-level feature (#15838)
CPackWIX: Fix installed file property lookups when using components
CPackWIX: Allow patching of shortcut components
CPackWIX: Allow multiple patch files and diagnose if any are missing
CMake: Mimic NSIS options dialog in WiX installer
Prayag Verma (1):
Help: Fix typo in `cmake-developer(7)` manual
Raffi Enficiaud (3):
CPackDeb: ctest tests for compression scheme leak
CPackDEB: minor documentation and debug logging fixes
CPackDEB: added config file optional Source field
Rob Gowin (2):
FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment
FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on Windows
Robert Dailey (1):
cmake-gui: Add option to specify generator toolset
Robert Maynard (4):
CPack/DragNDrop: Use source file extension for background image
CPack/DragNDrop: Place the background image file in a hidden folder
CPack/DragNDrop: Optionally run an AppleScript when making a package
CPack/DragNDrop: Update documentation to include new variables
Roger Leigh (11):
FindXercesC: Add imported targets and unit test
Utilities: Add BoostScanDeps script
FindBoost: Embed component dependency table
FindBoost: Automatically add missing component dependencies
FindBoost: Add imported targets
Tests: Add FindBoost testcase for imported targets
FindTIFF: Add imported targets and update documentation
FindGTest: Add imported targets and update documentation
Tests: Add tests for FindGTest
FindBoost: Add support for Boost 1.60
FindXalanC: New module to find the Apache Xalan-C++ library
Rolf Eike Beer (1):
FindCUDA: drop CUDA_dl_LIBRARY
Ruslan Baratov (1):
Xcode: Add support for combined install on iOS
Sam Thursfield (2):
FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910)
FindPNG: Create an imported PNG::PNG target (#15911)
Sean McBride (1):
Fix trivial clang -Wdouble-promotion warnings
Sebastian Schuberth (2):
FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND
Help: Document the CMAKE_EXPORT_COMPILE_COMMANDS variable
Sergei Nikulov (1):
FindBoost: Add support for Boost 1.61
Simon Levermann (3):
CPackDMG: Add support for multilingual SLAs
CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable
CPack/DragNDrop: Allow single license for multiple languages
Stephen Kelly (281):
cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.
cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.
Xcode: Extract a AddExtraIDETargets method.
cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().
VisualStudio10: Initialize the LongestSource at generate time.
VisualStudio: Replace Compute override with AddExtraIDETargets override.
cmGlobalGenerator: De-virtualize Compute().
cmGlobalGenerator: Do more computation at compute time.
cmGlobalGenerator: Move path computation to Compute.
QtAutogen: Move SetupSourceFiles method.
QtAutogen: Move GetCompileDefinitionsAndDirectories method.
QtAutogen: Move SetupAutoMocTarget method.
QtAutogen: Move GetUicOpts method.
QtAutogen: Move SetupAutoUicTarget method.
QtAutogen: Move GetRccExecutable method.
QtAutogen: Move MergeRccOptions method.
QtAutogen: Move SetupAutoRccTarget method.
QtAutogen: Make some private statics file static.
QtAutogen: Use a target type between loops.
QtAutogen: Port global generator to cmGeneratorTarget.
cmLocalGenerator: Constify target in API.
CPack: Remove needless cmLocalGenerator c
[Cmake-commits] CMake annotated tag, v3.4.3, created. v3.4.3
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.4.3 has been created at a1ecc5d06c1f86f31da8a0b3a8d58c06aa77417f (tag) tagging 0aef6f2412177a236deb292654402518777f3cb0 (commit) replaces v3.4.2 tagged by Brad King on Mon Jan 25 09:54:04 2016 -0500 - Log - CMake 3.4.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWpjcMAAoJEC0s7xA0khaEKwsP/iWSM84qMWbZqeLsg6lkN9sz a/Hk/eXJEPz8XqbNq9dz6n+j3fBSlFGAe8PTobee+Cv+qndOnnRqjYc7t9r5rxWz tolaKNFoH9vBjz5bELe5DH/Loc7NEzkvY6qVwT0zXU2B9Tn/c8s1YGEkzTGszJZ0 8IGQiPBDbl7OnuB6KwbubIfGXnyPMfaZ0I9mEeWAD8ZPoliLGsTWLyQQTE+ih7/a /4BgQQca8BZq9OM1R3Hr3ZgfWQB8MrCKPazwdRFBjZHI7HI1WsisQL/cxRtHdONH QMENkB0mVLeL+Z/etl7CaihmiPJ7ntjAMUzyXGR/kVssChXCYCE7XAydTgZi+OUF VvPYCB4pbnjVNr+f8/ccsG6pwCcZ3i9C6s+ulUWScQ/4TRXslpadFgffaqfVgTgl NKftB14VKxKE74N+wtmCcbS0AafVOv2cZ99mZ27YadZ7K33xjLQ8OnGrKmnT/HYq eCNz7w91mAdmeAkPYDlz6FmdhJH4Q9wpekAq89FSZFcqFH3+wSvg0mkooYHOGGIe YfOFOFQlP5wCrvFTjMm9SmWtmTA96Q8abNBJtiBawDWcI074YlZ5tl5/8WSWGCLp q0E4GjVzpMd/a40U2fe0wYvUXf6QAtjuLjHZaR/vG1NKZbdqFkZcWV2otw/J47zs GL+cbH3lMX5Pcjr3R1UY =3N0v -END PGP SIGNATURE- Brad King (3): VS: Do not fail on Windows 10 with VS 2015 if no SDK is available (#15929) Merge branch 'vs-win10-sdk' into release CMake 3.4.3 --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.4.2, created. v3.4.2
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.4.2 has been created at e7153bdf97a402eb9b74b3811487b6299c3c441b (tag) tagging 6506dcaa20a7d17737517dbcba6102be564d8d66 (commit) replaces v3.4.1 tagged by Brad King on Tue Jan 19 14:43:06 2016 -0500 - Log - CMake 3.4.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWnpHKAAoJEC0s7xA0khaE+tYP/RCJIuPQx57adtYlXen+mfq3 ssnRLxjNsAeG6J0YvvzWk9NtEsCIDzwI46lbqnAh2rRsbffmezlny9aKu8ctnHyD vthB+YakSI8uKod+BItmwyDbrQDzlgw6nsC3hafGwotuZsNFKWjHMrkO9rNM+YSq eLweIR1ecbZxQYWXw1kLtZXID4bhCmFdn6lCweFt4Fy+Rr+AOGK/utfvGnwBSmPP xG8wwYNfEUBPhWgfS7OtnV9lyPMHQigJ0g6q/1Hlxz0IHTj2XZS6kLrx3Yybr4RV 0K/ZR+FzLPnGiukGH/IVz1DyPC4RXdZ78z5o7uteGmKiC+DORw+/vwQQ94lVI0g+ kzI56gbUYjLp8pTOok0R4lo9RxWfi8MUI2CCEiaWH24859GbFhDYgTmiGKLP9wtA diYhYIxQqd+7ST6TjbOSg6QORVaze+s+Rf+cj0ZmhZfwrHaIWQtVZ8++ArlJrmOj Ah4utwaF1km7Pj240RNJm6RuzZ4Yzspk60hWmkDrijnr4tXuJv9ZyuN5LaKT41wP wddwqgRvept1EaOGmL7TNvp5RpS8/TxLVQq4H7YtJUFptnaTzetIlddnkFMRQHWe yTKssJc/LWmJjs+Cl1q6quIjz6ze3eWfLST2pymzd9kuxl18/SQexJQwFn2EmKCX 85OshBbkaY59U9jgLGNp =kQq7 -END PGP SIGNATURE- Brad King (11): Merge branch 'fix-java-idlj-jarsigner-typos' into release Merge branch 'fix-CMP0065-NEW-AIX-HP' into release CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889) Merge branch 'vs-compiler-id-itanium' into release VS: Do not select a partial Windows 10 SDK folder (#15831) VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894) Merge branch 'vs14-debug-enum' into release cmSystemTools: Add VersionCompareEqual helper VS: Fix Windows 10 SDK version selection (#15831) Merge branch 'vs-win10-sdk' into release CMake 3.4.2 Marc Chevrier (2): FindJava: Fix typos in IdlJ and JarSigner component implementation AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.4.1, created. v3.4.1
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.4.1 has been created
at 1c011d39bb252d7f314eb837061d8dddc9bd1ce3 (tag)
tagging fd7180f0c0c2554c31afda235469df986a109fe4 (commit)
replaces v3.4.0
tagged by Brad King
on Wed Dec 2 11:42:40 2015 -0500
- Log -
CMake 3.4.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQIcBAABAgAGBQJWXx+AAAoJEC0s7xA0khaEwYcP/3erh/Eks00FZauiGP3RiH/c
R+qem3Gjqm01fXZKW2zfzgP//wk8KPVeOp/bgaB+yfq7NG78j00qPnjdYsDisLLb
1ECIMmKHYZ2TX6E0fiCrlTEfIOIxx6gCqZmIDCMF6EFYgH1IcIJfjIdLi3AhnAlY
Slu/6vE5DCBkJr26UnuKFJ4ALCm7eK4eJnpzw1qHhJk7Ighh4diZk9pem4f5IhWr
mE3oINbd8mj/AKAr3Zygp7r6FSSuIQ1FbYqW/I1NfiUeQbzThUZrU25Hf231hhRK
CgUzKkwnmvC8fKsxABaE91WDvJh4rT2SH4PdAZTafUXECUiJeDC2HjEff1q4MRh2
fSN5ok0ziwryh7P4F0jtxlh25ii25L48B2z0y6dnVvqrNkvG0MWzVYYQUmjfYDgT
KU208c/s4Lgr+/tKVpKmslbMD1atZmddY7EEQ65jOwm+8HGODlQJI2qldY79WEOL
t3ri/L16HDFwCI1SvPmavllJh612aH9R59MV5HGeQ2JDIrgkTMKzWycQgjvL1Ydl
Jp6q9Nx86tpU+9HcOMCWRunpyz/WgRes7pIRXmlCXl89VBxhXYjCiT/i4eGt7iXd
WwG8n58EqN/mJZ7tLwgPLVH/wcsUetbJOwxa2+D1XBBFVImLzMAFxXmw1ZjJGG0L
RGT7OkqlRZZiu151tFP0
=nODQ
-END PGP SIGNATURE-
Bill Hoffman (1):
Fix auto export symbols for Dlls containing /bigobj for 64bit builds.
Brad King (39):
Cray: Implement Fortran compiler version detection (#15845)
Merge branch 'cray-fortran-version' into release
MSVC: Fix linking with /MANIFEST:NO option
Make C and C++ default dialect detection robust to advanced optimizations
Merge branch 'fix-compute-default-dialect-lto' into release
Merge branch 'fix-ms-manifest-no-linker' into release
FindGTest: Refactor test type checks to avoid cases triggering CMP0064
Merge branch 'FindGTest-avoid-CMP0064' into release
Android: Restore generation of non-versioned soname (#15851)
Merge branch 'backport-android-no-versioned-soname' into release
Project: Guess default standard dialect if compiler was forced (#15852)
Merge branch 'fix-forced-toolchain-dialect' into release
Merge branch 'avoid-divide-by-zero' into release
Merge branch 'backport-fix-autodef-bigobj-64' into release
Revert "Disable shared library support when compiler links statically"
(#15855)
Merge branch 'revert-compiler-links-statically' into release
Tests: Add case for add_subdirectory inside a function
Merge branch 'test-add_subdirectory-in-function' into release
Tests: Add case for unmatched cmake_policy({PUSH,POP})
Tests: Add case for package version file unmatched policy scope
cmState: Skip variable scope snapshots to avoid call stack duplicates
Merge branch 'test-cmake_policy-unmatched' into
fix-find_package-version-file-error-stack
cmMakefile: Clarify purpose of method that pops a scope snapshot
cmMakefile: Remove unused PolicyPushPop interfaces
cmLocalGenerator: Use ScopePushPop RAII class to manage local variable
scopes
cmState: Enforce policy scope balancing around variable scopes
Merge branch 'fix-find_package-version-file-error-stack' into release
cmLinkedTree: Rename 'Extend' method to 'Push'
cmLinkedTree: Add Pop method
cmListFileCache: Implement cmListFileBacktrace ctor/dtor out-of-line
cmState: Avoid accumulating policy stack storage for short-lived scopes
cmState: Avoid accumulating snapshot storage for short-lived scopes
Merge branch 'reduce-cmState-accumulation' into release
cmOrderDirectories: Factor out directory comparison
cmOrderDirectories: Reduce repeat realpath() calls
Merge branch 'reduce-realpath-calls' into release
Merge branch 'include-for-mode_t' into release
Merge branch 'backport-NIOS2-CPU' into release
CMake 3.4.1
Kylie McClain (1):
Include `sys/types.h` header to get `mode_t`
Marek Vasut (1):
Add NIOS2 CPU support
Ty Smith (1):
cmELF: Avoid divide by zero if there are no dynamic section entries
---
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.4.0, created. v3.4.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.4.0 has been created at f6d18315c0033a3438e5b1c6ccee87f4d0128d30 (tag) tagging b4a2ada297214119647b26df8abe394cd73ca53a (commit) replaces v3.4.0-rc3 tagged by Brad King on Thu Nov 12 13:21:30 2015 -0500 - Log - CMake 3.4.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWRNiqAAoJEC0s7xA0khaELOQQAJ7/akoyFIONF5rkn6QnkSmV GrR+Pv4c594tpxSpNd5B0m3k6TrB4KHef+YYooSzGw7RCAoS/CeD3fOqhyDRHySH SHoM6o5EbvDXNjdaRNYSh1U04LFWZGY3v+z0j2TkZSl0j8+NkgK4DdC2xhzEKEzi kA1zYMFyu6G8xglI7LAdtPqOdv4uy1hLLxJAfocCuUPEcLvdYlpPIA/xx6d8g5xT fVWrHyELwaw8LCZoujwQMOVyujCuQE1bn4CF119VCBo0O6mHXGnkwRoXbeV0cd2g qTJr8GIJo0fq7kaOLZGJvZGxUEgDFCVyi+jGwPzu1j+ksdEyIwgw7pjtG7kchiSK X5zWxno02BXmjIGqJQILphKzvXPCwcSRD+grGdW3E0HvhjOcJKfoUJm2K1d8pVUA GP2OY9D7va97G9XT2HgWXSwHu/LGMqZUNTX0qWwJGB+cjXt6SnWqa8X5dHx8lqYj 2BKXfTlW7b8HKclwPK5WUpXMls+rISkLGVtEX2s6XcvUc14r4aYnALL2QYEmvAZ8 8q2PiPDtlWeyYY+85n9/A3Qxxo4wcbf1RmKWejpdnhbnhZEExoU3CEubjM3TmZoF 28IW1YYw5qUL3c0X4sRs1nfSEUplvGSkzHnnZLY5xIyEFo8iak2P9QKq6P+UKSR6 tIfHZcdw0RrN7LhVutFf =WtBE -END PGP SIGNATURE- Brad King (2): Merge branch 'fix-install-rules' into release CMake 3.4.0 Stephen Kelly (1): Install: Move SetHaveInstallRule to a more-obvious place --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.4.0-rc3, created. v3.4.0-rc3
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.4.0-rc3 has been created at 9e2d79704b97ca3806eca72aeb818aca984f5bb0 (tag) tagging bc4b6aa68dd48ffd567ae7a24abd8911a689c38a (commit) replaces v3.4.0-rc2 tagged by Brad King on Mon Nov 2 14:27:10 2015 -0500 - Log - CMake 3.4.0-rc3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWN7kOAAoJEC0s7xA0khaE1OEQALLWC7Z94iNoXGdrD9JgmA5I AMnHiGJsp9QT++nepmohhBeXYb+BG0YoTsz1FEhkjiraS+ZMtb2ohiZg+3xMdacI uEtLZdtCVmYDOeUgwbE8gL/DnoffdziQfhx95NH/9GsWWF3eL0s5rjb/jEubFBZE HtK1qWRn4EGqZX5AhaA2vli1dyn+b5lzdyNH0rU/S1as/jMj0x/8g7yGa3g1Aard V55foaubZdWXKYWjvUWj2WmDxlcKdA/idr6tgH+f+OVqMZeD8ZQ27xQgEgaXlLEO rNq0OS/3y0k8JLl5185LfgW32F6PA9Bv3Ty9/IuA6ZzxK4J4FVfjwZLTdVry4hb/ 9zjfQwROlN/I6wN4QDnd6Gjdee5UeRdRGPdUnvIboSZE5Lkh24/wgWxVaSL7+n9M mtHGiJ/bKY+YfJvM2iEDZJDLarePcJNCPvPnFDaYo1QoU9w+3DemOQ+IedFO2ifN S9ZSw6FkIOvxPaMBACrDvdsr8FVwIyc9gccczzFS9FTSzQB4oAwyHHehSiUjuHqW sG4Ro0wCibUIGqi95OnWpxi86tfB4GrrYDHz+Xjm5uF6ii4YOi1No5wo3Jj4QGqf /We2oc4gBTIfGJzvylyavT8DhmnKFMy2oFo6MvXp0kX+/u96t/WhSW45ucX+UEsX 0A5xEE/2E2n0Ce9EI47E =a83C -END PGP SIGNATURE- Andrew Shaitorov (1): VS: Add support for `.resw` files (#15811) Brad King (14): Merge branch 'doc-add_executable-typo' into release CTest: Fix regression in handling of a RUN_SERIAL test that fails Merge branch 'fix-test-RUN_SERIAL-failure-regression' into release Merge branch 'cpack-deb-fakeroot-removal' into release Intel: Recognize MSVC version for Intel Fortran 2016 (#15809) Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)" Merge branch 'vs-resw-files' into release Merge branch 'backport-revert-autorcc-qt-5.1' into release Merge branch 'intel-fortran-2016' into release find_program: Fix regression in finding an already-known path Merge branch 'fix-find_program-regression' into release Help: Document target properties setting Info.plist fields (#15820) Merge branch 'doc-apple-info-plist-properties' into release CMake 3.4.0-rc3 Christopher Dembia (1): Help: Add missing parenthesis in add_executable docs Raffi Enficiaud (1): CPackDEB: Use proper compression scheme for control.tar.gz --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.4.0-rc2, created. v3.4.0-rc2
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.4.0-rc2 has been created at 2b848180d46b682ad1074f740a2b01c80d4fca4a (tag) tagging 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit) replaces v3.4.0-rc1 tagged by Brad King on Wed Oct 21 13:03:40 2015 -0400 - Log - CMake 3.4.0-rc2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWJ8VsAAoJEC0s7xA0khaE040QAIJ49s2+UQqmbucIfhcRr8yS pWR0OYULTOKjTGnpiSPkJEpiDYNkV86o3dl8ILAyLl10O5ic3i8Z+5pkDiyt2eN4 RkIQC05dEVCflpjx7F+xbpalAgMti01PQy4nBoSzR4NM/K00r0LWz6lo91SKDBUl KdEz7mrV9NNtG+V1Wh+JorW/SYTlAB9CHx5A7Oeof2ANLEiFxpJgNtg9HJwmwWSO rNek52t0C2vjU+Vd390XOSrvIM2ofRWfBirncXnndRv29oRSo/uCmQyjTISD08uF sncifJw6ojBvdGEaC6s9/CdaetBksVlRNoeL5sNZr72qmH1qicEHq+yRDvYzuBkK N2sgJPEjLm19gol2c5hfiTGmsn5j8y8rMqX7esixPHFq+/jz8ifoOzvUhrL33Cjh wzvf9+5ze5zXZ/RyQ9C/s3QY/rGp84GyGshGQdn0ydlVMi9kj3cfkVY7ZtJNBWj2 OaNmdxonZNG1gql+X+36aJ77NdzBro3/8cj/eyF/22FscDZiywoE2DkrfGU86ChJ Oy4n8EGVJnNyUauvx+/TB2QmJ3DuKudZ6JpeSugPMtxSllkDUj72LPMyDc73pccC 5i09nV/sVDzV7isSu839iceA+MCsW1TmmPzsD3KHsKUmeAjmfQ7f89hmJ90zTQjS KPIulVu6y0lad7zbP7mt =dEA6 -END PGP SIGNATURE- Brad King (18): Revert topic 'compiler-features-solaris' Merge branch 'ctest-submit-content-type' into release Merge branch 'revert-compiler-features-solaris' into release Merge branch 'doc-clarify-shared-lib' into release Merge branch 'emacs-mode-fix-accidental-indentation' into release Merge branch 'cpack-wix-typos' into release Merge branch 'FindPostgreSQL-v9.5' into release Merge branch 'xcode-adjust-deployment-to-host-version' into release Help: Add release note about compile rule placeholder changes (#15787) Merge branch 'doc-INCLUDES-relnote' into release ExternalProject: Fix Git version report in error message (#15791) ExternalProject: Always use CMake builtin FindGit (#15791) Merge branch 'ExternalProject-fix-git-version' into release Help: Document add_test expectations of test command (#15798) Merge branch 'doc-add_test-requirements' into release Merge branch 'doc-file-GLOB-no-order' into release Merge branch 'fix-CMP0054-elseif-warning' into release CMake 3.4.0-rc2 Derek Bruening (1): CTest: Set Content-Type header for http file upload (#15774) Gregor Jasny (1): Xcode: Adjust deployment target SDK version to host version James Johnston (1): Help: Document that SHARED libraries must export a symbol (#15775) Kevin Burge (1): cmake-mode.el: treat keywords as symbols Kevin Wojniak (1): CPackWIX: fix typos in documentation Ruslan Baratov (1): Help: Document that file(GLOB*) order is undefined Stephen Kelly (1): cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802) Tamar Kranenburg (1): FindPostgreSQL: Search for version 9.5 --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.4.0-rc1, created. v3.4.0-rc1
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.4.0-rc1 has been created at 2b9bd8ea2dff25c70bb2067383c977e3db40dc67 (tag) tagging 679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit) replaces v3.3.2 tagged by Brad King on Tue Oct 6 10:45:01 2015 -0400 - Log - CMake 3.4.0-rc1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWE95tAAoJEC0s7xA0khaEQGQP/R6aq8wnFaijocRVsagJQsnz aFmZwioY/Q4q/q+Sk8qrNjnpf+agbjgVqprMkxiUyoYIu27pTTJ6JjP1qX56kPX8 f3QRx6evUnKbM7r2gw3a87qFfy6olKHd1sJH1MR/YOKzfbP0G4GeVacoFEODDuJE GVN5e6OukFEJ+/6NGOsySPLZ1pxkNGFDPVUJSdEf4rtQfGvFyD+yaJVGwPXQ9F3H m2DT4HLwzidITYLzxt6vl929wvOsMXE6t2GFHqIY1xTilyUQ6+oFNzFNbIGBngml WZIr6as/cqSOW2DeW56HIVmr9Teih0GbH15fSAxgYMDU7BEmwuAtBTs1tNQRc/vU ZKNiaJQCnlVqJoSdmecmabAT02Dc5UZ6/bagjVC/TVl1xJasLhwXW/5CfQ+u+CYD 6B0D05lRWOBaCjMIWBE0oXkzNTi/CkTDFjOVNRQOIGpj0R+JhEqFXzibo2BbH/8B z4aT/IJsNrm7CLLT+vZcOXSzEc5Et49JZQg55t7COeFZ8v0c+OzlI+9VF4DHAG0R S/phccmoO1rG9AzREaya1Nmz+yTWv1G/NmyMGJM5hK6ZaQe5lxYgFOG2G9imLHHu +B/KSd07GDHhhCmBkXFo17vUTJCf1wftdFw9bmdpqosqKhXoCMJJ/z1UdhdvfP73 9loelpmtI4qF+65RCMuA =1wLg -END PGP SIGNATURE- A. Joël Lamotte (2): FindProtobuf: Search x64 directories in VS-built protobuf source (#14833) ExternalProject: Tell "hg clone" not to implicitly update Alex Turbov (1): GNUInstallDirs: Add special cases for certain prefixes Andreas Bergmeier (1): FindProtobuf: Add protobuf_generate_python function Bastien Schatt (1): cmLocalVisualStudioGenerator: Use computed .obj extension (#13685) Ben Boeckel (7): cmake: add --trace-expand option FindPkgConfig: use execute_process to strip trailing whitespace CTestCoverageCollectGCOV: replace tabulators CTEST_CUSTOM_*: treat variables as lists ctest_read_custom_files: mention that ctest does this automatically FindPkgConfig: add a command to query arbitrary variables Help: document CTEST_CUSTOM_* variables Ben Webb (1): FindSWIG: Do not generate erroneous outputs with -noproxy Betsy McPhail (2): ctest: Optionally avoid starting tests that may exceed a given CPU load CTest: Show the number of tests for each label in the summary Bill Hoffman (12): Add options to launch the compiler through tools like ccache or distcc FindCUDA: Resolve a host compiler symlink only if it is Apple cc -> clang bindexplib: Import original implementation from CERN bindexplib: Add copyright/license notice block bindexplib: Drop code that CMake does not need bindexplib: Wrap long lines bindexplib: Build source as part of CMakeLib bindexplib: Teach DumpFile to return errors bindexplib: Fix treatment of some symbols bindexplib: Add support for "/bigobj" format objects Windows: Optionally generate DLL module definition files automatically Windows: Fix 64-bit DLL module definition file generation on VS 2015 Bill Somerville (2): GetPrerequisites: Add error checks for execute_process() calls GetPrerequisites: Optionally filter "objdump" output for speed Brad King (590): Merge branch 'release' Begin post-3.3 development CTest: Capture test stdout/stderr through one pipe (#15600) VS: Compute project GUIDs deterministically Merge topic 'CPackDeb-dpkg-shlibdeps-check-flag' Merge topic 'vs-deterministic-guid' Merge topic 'ctest-merge-test-output' Merge topic 'minor-cleanups' Merge topic 'rename-cmState-API' Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS' Merge topic 'cmMakefile-Configure' Merge branch 'upstream-kwsys' into update-kwsys Merge branch 'release' Merge topic 'update-kwsys' Help: Add notes for topic 'ExternalProject_init_selected_submodules' Merge topic 'ExternalProject_init_selected_submodules' Merge topic 'doc-add_custom_command-clarify-TARGET_FILE' Merge topic 'vs-deterministic-guid' Merge topic 'extract-cmLinkedTree' Merge topic 'extract-cmOutputConverter' Merge topic 'move-Feature-API' Merge topic 'minor-cleanups' Merge topic 'clean-up-cmMakefile' Merge topic 'data-layout' Help: Document CMAKE_SYSTEM_FRAMEWORK_PATH variable Help: Document CMAKE_SYSTEM_APPBUNDLE_PATH variable Help: Document CMAKE_FIND_APPBUNDLE and CMAKE_FIND_FRAMEWORK Help: Improve documentation formatting of find_* commands Help: Document find_* command versioned/unversioned name ordering Utilities/Release: Update to more recent Qt 4.8 on OS X Merge topic 'FindwxWidgets-versioned-executable' Merge topic 'cmake-gui-osx-install-command-line' Merge topic 'revert-mingw-no-find_library-dll' Merge topic 'ctest-script-mode-no-legacy-cygwin'
[Cmake-commits] CMake annotated tag, v3.3.2, created. v3.3.2
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.3.2 has been created
at f216be2227cd7191ba4eb82d36cf2d87685812e9 (tag)
tagging 650c630a663b2d0663e6ef6acda2a5fb94e5a621 (commit)
replaces v3.3.1
tagged by Brad King
on Thu Sep 17 12:59:56 2015 -0400
- Log -
CMake 3.3.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQIcBAABAgAGBQJV+vGMAAoJEC0s7xA0khaErrEP/R9wA6acDoryoZeN6XzfRQC5
/L8Qe4pHG0gbdGCTmziq537cOHZBanhrjNDln6VvRPQzy9GgKLXoPpV3gzLpSCLy
YIXFrvvNyH0n1V1gXjCJ9G+gCTTaGQ2oTmRMKcXBGFgDaUjxs3qXvseGp20UGsJE
zJYB+Er0XdX/qySpRtaZR0B12nvhd5QBSZJYIXx2FtKhjVi1Ua24GohVYDnHJapG
rZLiyUZWE7gtIMEIytWEySfj1kUhmx0R8fv3wPIB7nbn07elxKhC+XSOWNO4RNXS
2mIvpX5ZuolWQ9v8VZO2EAC3o44kD1KNeiK+2ZsozKLG4OPbigwT44WZxMAmD4XZ
1HnBay2LCiecI467Fhb9BaMN9NV4iSz1uLCOlib+a8WP7/pRUQqbizXL5ewD7aFr
Ec05MCFbH/GsnHjcb+cbo/MPSWSiQ9qX3P6wYrCJCzHfk2vQOdk6+w3VgZJ3RP+2
WbbgiN3cJQRumgfdKktGjcObOlNCea64U6iN0EwNikvP3V6huAqfWy2DYKEcqWSq
2betyK9lRejQ0MVOMnKE+ogE/3F5HxyE12IdhXXSeyM8nI1afI16kZAXM9TJE7CK
K/mDV/saPiPjBf/KYtVN/AYGeU3dUGNQCIajHxVM3De3kLuKmFitOy4OekftYacj
50bBD9Dwx2K90elSo+u7
=6uUE
-END PGP SIGNATURE-
Brad King (6):
Merge branch 'determine-compiler-CMP0054' into release
Merge branch 'fix-ctest-xml-double-encoding' into release
Makefile: Print color escapes only when necessary
Merge branch 'makefile-color-when-needed' into release
Merge branch 'fix-bad-search-ordering' into release
CMake 3.3.2
Chuck Atkins (1):
find_*: Fix search order when the environment duplicates some HINTS
Daniel Pfeifer (3):
cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includes
cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes
CTest: Fix XML double-encoding cases
Matt McCormick (1):
CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted
arguments
---
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.3.0, created. v3.3.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.3.0 has been created at 842849761d8327c3991cad924c8e04e78220ea2b (tag) tagging 3a0db0223b8c10cfaa6984253d794ab97425adf9 (commit) replaces v3.3.0-rc4 tagged by Brad King on Thu Jul 23 11:38:39 2015 -0400 - Log - CMake 3.3.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVsQp/AAoJEOyP7zp7+07azRQQAMz83FOa23GL4o2RF5SsS2rf aLtpnVV6oejHe8sxH2DeDuEJwY+6jxvGz78FKLa1M+VNTzjpLCVa5/AqHWiRaL1+ xKQJn72wIqiuQUBcxXlmZUizgBjMIHJjKGBf41TZoBQaMWM0WxANyECgRZ8sqlTz OdGFnMJd8VtG4m5HBfOSuryiywJ982KKjwAUKoHetFKqoUCwjZ9zFWqnNPnGEwdw otAqgIvJhLKop0hLyaGIFwwf5SIuoCJ1oOTFuhLpUWQc3PLG+HfwLD+cBiDEhabY b0Hv9E1RRz19uhMZBowNGNdIoulMBuudUyvPinlJh4aW/gEvMqeh6vqJUaCsfUlZ qpYsVa6iXBQMFDgjSi8uWDcxp5haoevOT5JGF27PMEjBcEo4BgGPs0Znb0XOTsw+ atILTSFSQw9YDcqcbpKyQGBc7n+LsCIpWjBdb+N9RThmae2xRAwTShvmPxSnbXal rqSLT5l4L2dqAeJxyw1/YqYzY1sTGKFYMLujoOKWXqfcIb35B8i+nZzP7lqGV1Yq KOmoRxkPRF+0ZzcJALcHtoB0gzFD3c48CgPopu4lR27t6XXbtxanV9S3p1ATKBgz 5JvNyfURLHWnM2RKcuY8qyYYHVCGgJ4+/UFkahrCjqfhomXNP2YkSw7b4Qva/k3x BrFTbXKku25a5qk3lt/C =Vvln -END PGP SIGNATURE- Brad King (7): CMake 3.3.0 Features: Update MSVC features for VS 2015 RTM Revert CMake 3.3.0 Merge branch 'vs-compiler-feature-2015-update' into release OS X: Use -iframework with AppleClang only on version = 4.2 Merge branch 'osx-iframework' into release CMake 3.3.0 --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.3.0-rc4, created. v3.3.0-rc4
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.3.0-rc4 has been created at 5635a5395c279d6dd0c1483d8d1f41836a58d415 (tag) tagging 8c9c9aa07f3ffaa48ebaea6adc8027b905298338 (commit) replaces v3.3.0-rc3 tagged by Brad King on Mon Jul 13 14:10:40 2015 -0400 - Log - CMake 3.3.0-rc4 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIbBAABAgAGBQJVo/8gAAoJEOyP7zp7+07a7UEP+Lj0Seed35nmgKmnaxsSeNfy Wi58daemhZoUJ2YEAu2c1tc3TtoruWlkN3sNgCf3cf8X7hfZ8C99qs6T4yOiXPBp muioMJhwPEaTlxMzJ5QfLNy/Sf9FxBkMbe1saPcwu3Work7M4zxrUNFD495+G5Pr CZxB1QCd39SrHWUMKonfunaLRUa1OKZB9ySdZb2ux+D/JrBY8eXcl+8k2y9AoRfF rXuNnNc0FqeL9XDqFisdGAhl8mfkozEhwXEv6QhV36FrTV3C1F8haHJXqIsRwVip 1CMevNj5oYcjZG/5eV5ckatJBQTvHKEK0HCafwWSooJJXvAk/vIhhojQpSkvlOpx acwtLeDm2IdAbeSDjPzD94NLJKqll70sz6Ma7k0xNChNm80ltAL5BNWRWrtSNAL8 3uS0ZhoNdoWoC7JQQd1LOCFl+1bjEilyEzQhFjUp8dIrvKt68VhczAf0oPkCw/h9 O19MZ3cn9aK4MZiJ2MzVq96DXRH5hk8jXVlmZki+460JxMScRl76HGsz7NNS2t3s Ixe0mmw0Qm5cpiBaqDjan5MNIwiXg8Q86JeBGj4P5/ZnMOR506DNcHp0PzifKYc7 43YZ1Ym9Wwhwt1B96fxZcoALU29miBBd7DHZfVWd4Ex8mTlE4V2eYfu3JFoVS7Jw A8vJx/Uhpz9EhLFogAc= =VYrc -END PGP SIGNATURE- Brad King (11): Fortran: Fix passing of preprocessor definitions to dependency scanner Merge branch 'FindMatlab-doc-section-headers' into release Merge branch 'fortran-module-preprocessor-defs' into release Check*CompilerFlag: Revert to previous method used to pass flags (#15641) Merge branch 'CheckCompilerFlag-do-not-use-FLAGS' into release set_property: Fix crash when setting LINK_LIBRARIES to nothing Merge branch 'empty-LINK_LIBRARIES' into release Merge branch 'cpack-ifw-framework-version' into release Merge branch 'FindMPI-Intel-5' into release Merge branch 'fix-command-rename' into release CMake 3.3.0-rc4 Konstantin Podsvirov (1): CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION Sean Brennan (1): FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs Stephen Kelly (1): cmState: Restore renamed commands on cleanup. Tamas Kenez (1): FindMatlab: Fix documentation section header underline style --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.3.0-rc3, created. v3.3.0-rc3
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.3.0-rc3 has been created at 4beedb2629bbefbb7aeaba3d55ced5510faeafa0 (tag) tagging 74c99d11bc62048a069bd6c89b48cf4f94884210 (commit) replaces v3.3.0-rc2 tagged by Brad King on Fri Jun 26 10:17:02 2015 -0400 - Log - CMake 3.3.0-rc3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVjV7eAAoJEOyP7zp7+07a4EcP/0z5Rq5KtG+AhAb+2XKfEX2V bt/KugZkp7O5xQxR9Vdi2tK/Cm3JOkiIriBRlIwmRUgY0cbB75SOuySTuo7u8d55 D1XsUCtiCRhgznrvGMDAaV13RN6tfl+Cn4PDfyJFSvxWCzLDGFiFQUMso8FBuHa8 F1mTzm2PJj9/Sd7fBweYVjGPzo1Wq15iXIiorttXWFqrZCLMZaGZ1g7uWWt0MrFF XOj8q3Qf27fTMgXrvoh4CfjzLynoUX+ZB0qNQHRrT0e5tm9kCkPY0DTbJ3DXhdKJ EVwWXTOPRlq+WULc36uRkiKbhS5CZe0AcYokCas7swSl7IGiAXW91c4ZLQ3T8Uvi jxT9vE8tYuPE3lrvkgHRwb9ISX3TwoZ5h8zmET8T6oM7reUCtbuMvBUHevdkvVcY CH1DnOo0ez0LhIMbWdvOXv3EypVEeDtaQV6MRHe7HQmzJkFSC5V4UoV00YWCADPB x2iSNEW1vZxWkoTzR4bv96tVW1sQKNKHyGKT8P37TSKEGpJLPXG5tvLfIScaMrSu qbEs/h3t5v3Ykljx5m2gHdcyWyc7/ZGxInUuQJTugc9s4bJ2px/hz0yy/wLdzIoL GT9wNsIc0gPZvlL27sim1tsr/A3vw1gEw1wE3H/4lbePwFtY/RqxuQmXG8JPAjL5 s3GpLDmfUXFcz5tAEj05 =Lvp4 -END PGP SIGNATURE- Brad King (14): Help: Fix typo in CMAKE_GENERATOR_PLATFORM docs (#15621) Merge branch 'doc-CMAKE_GENERATOR_PLATFORM-typo' into release Merge branch 'doc-cmake-buildsystem-typo' into release Fix assertion failure on unmatched function or macro Merge branch 'fix-function-missing-end' into release cmake-gui: Change --install to use /usr/local/bin by default (#15627) Merge branch 'cmake-gui-osx-install-command-line' into release cmTarget: Fix diagnostic of target_link_libraries in wrong directory (#15626) Help: Revise CheckIncludeFile* documentation Merge branch 'doc-CheckIncludeFile-distinction' into release Help: Revise CMAKE_*_PATH and CMAKE_SYSTEM_*_PATH variable docs (#15631) Merge branch 'doc-find-path-variables' into release Merge branch 'fix-target_link_libraries-wrong-dir' into release CMake 3.3.0-rc3 Erik Sjölund (1): Help: Fix a typo in cmake-buildsystem(7) manual --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.3.0-rc2, created. v3.3.0-rc2
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.3.0-rc2 has been created at 6cd135ec945ac78f8320becb8c21bd6a745c8f36 (tag) tagging 86bde2ef3e5d56ca7326b51e6608a79a08eb90cd (commit) replaces v3.3.0-rc1 tagged by Brad King on Thu Jun 11 09:17:35 2015 -0400 - Log - CMake 3.3.0-rc2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVeYpvAAoJEOyP7zp7+07aQmQP/2Fl5d+LTiG2JUQyinBYmP1Y NHtZHBlNvI9W6JOgyfExGQ21ztT8sxUIIYeD0d6lwcx646G3IRm8HEXOzEqeLGFE xRClYSZI/r3tKdxZRzDcSC8zKcnUGd0Tm0HN9GtVDVwjidlVMVdbkRQRGyJb6/yi 6rxE9ZyrCcr1GRqqVAF7/JbkUcUCtYitCb1ABiLZRBmU4AWHSSZVrBb31ahtbX/E 6xdBk1igckMlOBo4vrSWVRNQ9CYf2OOKS3bZlZAyf5xpv/mhCI5e1bqspcpKM2Fh 7ofTKI1MBB+aXtXemQbOFl7wmRWAQEr/UjXMoBeTjyIuUSvLWUzc+VtKkvVUCf+F sNUJtfuaThSDQfCTK9c/2wELYutJk7xEBKyppPUjPSi0zioBWejIhrGBlswxW7OJ /jpb6TaeKoFrKz6U8hp8nKsQhIJusRcSEUBwvLG7vpLkq0f+AbMGdl8unnzxfG+7 NJK7jNv2kp6TJ+DKPTq6MUIocbMTVsuTOPvn8NeN4N3nPVDgrsuD3n4IoG7DcFz8 /byg2qNvFlYkye+Nqwi4UBhYR5k+sVWQ8qe2V9t/DcTNJXEPNyWUjIozD3yQ2gxY 5CeGQOlYOclcs3t3HA/wIh/HuXwSC+LVrnNO4l7LD79mAfm09AG5yg24kLd9kK+F 4nqAwf+2x/KKOm6c5KXI =tu06 -END PGP SIGNATURE- Brad King (14): Help: Reference TARGET_FILE genex in add_custom_command docs (#15605) Merge branch 'doc-add_custom_command-clarify-TARGET_FILE' into release FindwxWidgets: Fix find_program call for versioned names Merge branch 'FindwxWidgets-versioned-executable' into release Merge branch 'cmake-gui-osx-install-command-line' into release Windows-GNU: Restore find_library treatment of '.dll' as linkable (#15409) ctest: Disable CMake Cygwin legacy warning in dashboard client script Merge branch 'ctest-script-mode-no-legacy-cygwin' into release Merge branch 'revert-mingw-no-find_library-dll' into release Help: Drop incorrect advice from cmake-developer.7 manual Merge branch 'doc-drop-incorrect-cmake-developer-advice' into release Help: Document explicitly that policy OLD behavior is deprecated Merge branch 'doc-policy-OLD-deprecated' into release CMake 3.3.0-rc2 Clinton Stimpson (1): cmake-gui: Make command-line install help text selectable --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.3.0-rc1, created. v3.3.0-rc1
. CPackWIX: Refactor start menu and desktop shortcut creation. CPackWIX: Add installed file properties for the creation of shortcuts. CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property. CPackWIX: Enhance CMake CPack WIX generated installer. CPackWIX: Add release notes for the wix-shortcut-properties topic. CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES. FindHg: Run hg with C locale when querying its version. CodeBlocks: Declare which source file belongs to which targets. CPackWIX: Support patching of root Feature elements. CPackWIX: Fix .wixobj output locations and filenames. add_custom_command: Diagnose MAIN_DEPENDENCY limitation. CPackWIX: Customize CMake installer theme. CPackWIX: Add static_casts for XML_Parser. CPackWIX: Omit codepage conversion when internal encoding is already UTF-8. CTestCoverageCollectGCOV: Support CTEST_CUSTOM_COVERAGE_EXCLUDE Help: Clarify manual reference for generator names libarchive: Use base-256 encoding for UID/GID like GNU tar does cmake: Teach -E tar command a --format= option CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar format Tests: Consolidate, refactor and extend -E tar tests CTest: Fix locale used for VCS updates Help: Clarify that CMAKE_SIZEOF_VOID_P is specific to the target machine Help: Clarify policy CMP0026 title Revert add_custom_command: Diagnose MAIN_DEPENDENCY limitation. if: Implement new IN_LIST operator Orion Poplawski (1): FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540) Oyvind Jensen (1): VS: Add more Fortran compiler flags to flag table (#15381) Peter Wu (1): CheckStructHasMember: fix null deref warning (#15413) Raffi Enficiaud (12): FindMatlab: Rewrite module and provide a usage API Tests: Increasing the stability of the FindMatlab.basic_checks test CPack: Fix single component packaging CPackDeb: Fix lintian md5sum file warning CPackDeb: Add basic package tests CPackDEB component description CPack/DEB component dependency auto-discovery CPack/DEB per component dependencies CPack/DEB: reworked documentation FindMatlab: Drop incorrect usage option from test helper script FindMatlab: fix header visibility of the generated mex files FindMatlab: fix reconfiguration of Matlab_ROOT_DIR Robert Goulet (1): VS: Add option to put INSTALL target in .sln default build Robert Maynard (1): Help: Document supported compilers in cmake-compile-features.7 Rolf Eike Beer (2): if(): avoid one needless string compare for all if() statements CheckTypeSize: Avoid if() auto-dereferene in quoted arguments (#15571) Roman Wüger (1): WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers Ruslan Baratov (1): BundleUtilities: Teach fixup_bundle to check install_name_tool result Sean James (1): Xcode: Add file type for Metal shader files Stanislav Ionascu (1): Qbs: Add new 'extra' generator for qbs project files Stephen Kelly (446): Remove use of cmsys_stl. cmLocalGenerator: Replace loop with find_first_not_of Remove use of ExpandSourceListArguments. cmMakefile: Remove ExpandSourceListArguments. Take computation out of loop. Extract a prefix variable from loop. Convert loop to algorithm. Convert while loop to member insert. Use insert member instead of back_inserter. Take a size check outside of an inner loop. Replace while loop with member insert. Replace a loop with std::transform. Replace loop with algorithm. cmComputeLinkDepends: Remove temporary iterator copy. Replace loop with member algorithm. Replace temporary bool by inlining warning condition. cmSystemTools: Early return if size makes later comparison false. cmSystemTools: Remove unnecessary comparison. cmStandardIncludes: Remove some VS6 workarounds. cmStandardIncludes: Remove deque include. cmStandardIncludes: Remove list include. RunCMake: Remove unneeded files. RunCMake: Allow specifying the directory to run tests in. RunCMake: Allow specifying the stderr file for a test. Tests: Split part of include_directories test to a generic location. Tests: Run IfacePaths tests with a parameter. Split cmAlgorithms into a separate header file. Tests: Move IfacePaths test stderr files. Allow export of targets with INTERFACE_SOURCES. Add release notes for export-interface-source-files. cmMacroCommand: Replace a loop with cmJoin. cmMacroCommand: Extract iteration starting point. cmMacroCommand: Execute loop only if it has an effect. cmMacroCommand: Remove counting variable. Convert loops into the commonly used pattern. Convert loops populating maybe-empty content
[Cmake-commits] CMake annotated tag, v3.2.3, created. v3.2.3
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.2.3 has been created at 0a569d18496d4d384971d0c42be4300949896dc2 (tag) tagging b3de2a8e6451c9138948c23a974740823ade8263 (commit) replaces v3.2.2 tagged by Brad King on Mon Jun 1 13:11:11 2015 -0400 - Log - CMake 3.2.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVbJIvAAoJEOyP7zp7+07aK2QQAIBHVo+Nbn1GhUTPczDRP1BI 9fYQwGx/truU7JVWKiK3244u7QdqMy18CnVM3uDIi1gNkWLF8XOEIs6QudRQv3Dn USSptpMiOTG7BwOaoinYGKDZzLQ3kJsvQseS42ghIaiCpcu3JP6p37MdgeOver4M ZgT+rKPXhLnzEnQn4HIyqoQMk/R38tIt3YzguP/JJnkdO3mXPNKRR2XF1q3uskEC AsX1uxxmYb0eqHMXdd4Vy3z65bf7dki9ziw3TRh3Uz3M5zmAekaF+aSWqfLB2V2i Sex8DFAGkZ3RPtjfrfcsVU7ETL1b4S2XC2zxsRE3+K+RFnWp5PdQzemnCnqv1KrG w+GNkPFZRN/PFr2NBnzAVG6c4Z6n9Xm7AxvaxBvuv/S/Mtw/eF7Ej3zWXCZS/B+8 o1WTEa5CKr+ZLvO4f39qjKlAWwYo4joCKd1dIvgLC0uEQ7t1mBNOj2U2k/jUC1Iq YpxWrfLRiaVspBEu7OHnMiifKjnSrPkYEIidjGQ+2X77LKwGNR5xHjtbycIjnbng 2kyygJVtwf5rk8bYQ4gs6e+U7HEnsfmr46AJBs/3hqMWBPEfbQNRwkaIx31GE84E yUl17rm4ju/2i00PVD5DIkpEArIzn677h/GxwYmrYs6pZLHImMWAcyLZLE90+maq eE9oaGEhIwng7XP8DJg3 =3fEX -END PGP SIGNATURE- Brad King (10): Makefile: Workaround mingw32-make trailing backslash trouble (#15546) Merge branch 'mingw32-make-backslash-workaround' into release InstallRequiredSystemLibraries: Update for VS 2015 (#15552) Merge branch 'InstallRequiredSystemLibraries-vs2015' into release Fix assertion failure on unmatched foreach in function (#15572) Merge branch 'fix-function-missing-endforeach' into release Merge branch 'ctest-update-gmake-error-match' into release Makefile: Fix compilation after parent commit was backported Merge branch 'mingw32-make-backslash-workaround' into release CMake 3.2.3 Zack Galbreath (1): ctest_build: Fix regression in GNU make error message matching --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.2.2, created. v3.2.2
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.2.2 has been created at 0f45dba42da3b06db86d73e5e5ecf7030ade3f8b (tag) tagging 91d5261b58e97107fca610a868fbc283cbb8c856 (commit) replaces v3.2.1 tagged by Brad King on Mon Apr 13 14:27:58 2015 -0400 - Log - CMake 3.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVLAquAAoJEOyP7zp7+07apUcP/2vIWVSNQ9mXzg6o9tvMBlzM PoMv9qes6hDAYLRRpiPZRqtJLSEpNLueTG4RYVXn+rO9jivyDSjqYC8SfpXlDr2l G37BTyFxwQlvU3hCssgBd9Ez+lW8VXvt8vSMtIyTTDXnCCJUaq6uEnYLOUnb7QwL uRekfehx6Jpaoz7AgVmFOlsRKISFu0l7VQVMNk8dYQbi12xVMzYbEiSQkNNJ9kiY pjQ+rkaSFTfhe58b5O5wrZ0YzYDC0SjjAXrTlC6y/BmRRip++nfZQ3+jBKmjtqvO OuI+qkme6t6YHWS+8RIpTXuXWchEV83wpdwsoz+2r4Pxt7rldqP1g1sKpLpUElv0 Em5LXan5ajoFrXUopBcCbxoUrY5ABBIoJoldUJ0bFm2gJv95zyPTzo0SpRteX0WS K4t7lGNOe6AQl/4m4j/Y1PDdrhMlJ7Ts3qr9sGwP0/Yh9LQi93LfCiBcDOR063/Y bEtiAwM2R+YuIgErb1CfHetnRi8D/F0LATlWrJ2xPxg17FsFjdpnKEj3rjUlEFtu 72psfuj88knCi9kNbSO/Cb14lCGEQU9hdHF4tzuvGukXb7zb6GlILQ+rteCX3HW3 v51ONXGMpqagr1qxvXSPPvDl2TaoLNZ4anCG/7ppkDDmTmVImBG2px8kW2nUUWsP DkrVEEGhT2mVq8d7BsHZ =ZIOK -END PGP SIGNATURE- Betsy McPhail (1): file(LOCK): Close file descriptor/handle when releasing a lock Brad King (15): FindMFC: Use if(DEFINED) to simplify condition (#15477) Merge branch 'file-LOCK-close' into release Merge branch 'FindMFC-CMP0054' into release curl: Never consider using Windows APIs on Cygwin Merge branch 'curl-cygwin-no-windows' into release liblzma: Use unaligned access only on Intel and PowerPC archs Merge branch 'fix-liblzma-access-alignment' into release liblzma: Disable XL compiler optimizations liblzma: Disable GNU 3.3 compiler optimizations Merge branch 'fix-liblzma-optimize' into release Merge branch 'fix-libarchive-mktemp' into release KWSys SystemTools: Teach Touch with !create to succeed on missing file Makefile: Fix multiple custom command outputs with one missing Merge branch 'custom-command-multiple-outputs' into release CMake 3.2.2 Tim Kientzle (1): libarchive: Fix string concatentation in Windows mktemp implementation --- 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.2.1-1570-ge1d2a67
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 e1d2a67b86cfdc54c028128589673aae144e9c17 (commit) via aa287e70d2ecc402565228e05643e0d066b84e5e (commit) from c19af05c6a04482dca164a44fbcc326e591b06fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1d2a67b86cfdc54c028128589673aae144e9c17 commit e1d2a67b86cfdc54c028128589673aae144e9c17 Merge: c19af05 aa287e7 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue Apr 7 14:11:45 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Apr 7 14:11:45 2015 -0400 Merge topic 'document_supported_compiler_feature_compilers' into next aa287e70 Document which compilers support compile-features. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa287e70d2ecc402565228e05643e0d066b84e5e commit aa287e70d2ecc402565228e05643e0d066b84e5e Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue Apr 7 14:10:50 2015 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Tue Apr 7 14:11:30 2015 -0400 Document which compilers support compile-features. diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index 7a6c249..210baa4 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -295,3 +295,15 @@ the feature-appropriate include directory add_executable(consumer_no consumer_no.cpp) target_link_libraries(consumer_no foo) + +Supported Compilers +=== + +Currently the supported set of compilers for the +:command:`target_compile_features` command and :prop_tgt:`CXX_STANDARD` target +property is: + +- Apple Clang (AppleClang) for Xcode versions 4.4 though 6.1. +- GNU compiler versions 4.4 through 5.0 on UNIX and Apple (GNU). +- Microsoft Visual Studio (MSVC) for versions 2010 through 2015. +- Oracle SolarisStudio (SunPro) version 12.4. --- Summary of changes: Help/manual/cmake-compile-features.7.rst | 12 1 file changed, 12 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.2.1, created. v3.2.1
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.2.1 has been created at 730e5cea3eabe3d1e2a39984c92404a5c29fce92 (tag) tagging 732d8a467ab8a295b1bbf580f865980f8a1a9b29 (commit) replaces v3.2.0 tagged by Brad King on Tue Mar 10 14:28:53 2015 -0400 - Log - CMake 3.2.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJU/zflAAoJEOyP7zp7+07aeUgP/3UV3i6AVLEyd4GMWaRc7w4A q8P4h5kzgQ6fboqQ26+e73Nz4i1jdR/0+1FWCfot9kIg9Yur8x+mdTRCZGEwAG4i ZotCsWANyBqqDEgoTntfX3OcebE5kGAsZeVGXAQ75RE5m5VKw4S5TOYENof+fx/j VCXBTtGdryqU2rvLfuQ/hYkM+2ke6afe2a+ZeZAF7a0Vg2g7JJVt7P3ntD7FfAxN QUx6hxMVY6mfQ9osTRQbRmFfhuLZo8m4xFIqTTxcwWESTW28OePvHCDWH2Ql2tp7 8uDVtXoyFMYuRrCSY5nHkOaZSYumE1Z5vYcZLZA6UcjDv3VW+H3KpxTbJvN/aZXD k3AIlkedRtuCPIUg17wjpeYuF73hSEipRdBF25L7qGyUlNl7tj26rmI37nVD9WSz SBnXL5arsn3QrbeguDthTfyoak6BNtcxEyILxGq+QOCBLTnFh9eSq1bH/MYY0kjK 2PCfK4L0IKbtqBeSWd7L8w7K2FCJ5FjzrAzw3mp6iWtNbPnyQKQrIJVRsFeasfox 9cU1vIffX2a5qjMGC/GQUnR8CU7qkahlWYkOFd9AoBu6BKLwqahjHIW9mlONYZmZ XCNWulZwVY4OmOR8k8kV186EZH23PbIm5i+5U2yxEwXks6hzW8uHl6KCexl8laGO QWLudfzgitZNQvvmdICu =AUL6 -END PGP SIGNATURE- Brad King (10): Makefile: Fix multiple custom command outputs regression (#15116) Merge branch 'custom-command-multiple-outputs' into release configure_file: Do not warn about newline style arguments Tests: Add more signature tests to RunCMake.configure_file test Merge branch 'configure_file-NEWLINE_STYLE-no-warn' into release Ninja: Improve internal check for generating at the top-level (#15436) Merge branch 'ninja-check-root-robustly' into release UseSWIG: Avoid if() auto-dereferene in quoted arguments Merge branch 'UseSWIG-fix-CMP0054-warnings' into release CMake 3.2.1 --- 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.1.1-2404-g081c724
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 081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc (commit)
via 13530ca17efc81a393effa80efc527eeca28cbe4 (commit)
from 8dced126375dba8ba8a4d8718331c77898e0da68 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
commit 081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
Merge: 8dced12 13530ca
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jan 27 15:04:32 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jan 27 15:04:32 2015 -0500
Merge topic 'feature-record-msvc' into next
13530ca1 Help: Add notes for topic 'feature-record-msvc'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13530ca17efc81a393effa80efc527eeca28cbe4
commit 13530ca17efc81a393effa80efc527eeca28cbe4
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jan 27 15:03:10 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jan 27 15:03:10 2015 -0500
Help: Add notes for topic 'feature-record-msvc'
diff --git a/Help/release/dev/feature-record-msvc.rst
b/Help/release/dev/feature-record-msvc.rst
new file mode 100644
index 000..226a338
--- /dev/null
+++ b/Help/release/dev/feature-record-msvc.rst
@@ -0,0 +1,5 @@
+feature-record-msvc
+--
+
+* The :manual:`Compile Features cmake-compile-features(7)` functionality
+ is now aware of features supported by Microsoft Visual Studio (``MSVC``).
---
Summary of changes:
...{SolarisStudio-compile-features.rst = feature-record-msvc.rst} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
copy Help/release/dev/{SolarisStudio-compile-features.rst =
feature-record-msvc.rst} (50%)
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.1.0-2189-gecfb1d6
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 ecfb1d6137b547f9b3b9fe5517a8aba3c177fb97 (commit)
via 7c335f150524a219f44023eeeb353c6ae5bd67b8 (commit)
via adfba79088fa3370fc9d77082e0aaedf045851e6 (commit)
via fc44c07b9c0ff06e0810e3547c6fe661e786d4ba (commit)
via 54da94ad01f457cfab41c3e479bba083a67ab552 (commit)
via 797dc0cf0d3f1fba43a9689499c466f09ba2900d (commit)
via b69437a25d0132cd153d9a037207a440c9fa4815 (commit)
from 6351880c2aa815f389e0154ab41b7138a5cbf6b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecfb1d6137b547f9b3b9fe5517a8aba3c177fb97
commit ecfb1d6137b547f9b3b9fe5517a8aba3c177fb97
Merge: 6351880 7c335f1
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 12:59:11 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 19 12:59:11 2015 -0500
Merge topic 'feature-record-msvc' into next
7c335f15 Merge topic 'SolarisStudio-compile-features' into
feature-record-msvc
adfba790 Features: Temporarily exclude MSVC from Link Feature tests.
fc44c07b Features: Enable writing of MSVC compiler feature header.
54da94ad Features: Record for MSVC C++ 2015 and MSVC C 2010-2015.
797dc0cf Features: Record for MSVC 2010-2013.
b69437a2 Extend test for MSVC.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c335f150524a219f44023eeeb353c6ae5bd67b8
commit 7c335f150524a219f44023eeeb353c6ae5bd67b8
Merge: adfba79 bcb0478
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 12:58:57 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jan 19 12:58:57 2015 -0500
Merge topic 'SolarisStudio-compile-features' into feature-record-msvc
Conflicts:
Modules/WriteCompilerDetectionHeader.cmake
Tests/CompileFeatures/CMakeLists.txt
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
diff --cc Modules/WriteCompilerDetectionHeader.cmake
index 2ecf481,e81bc08..5642c99
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@@ -321,7 -321,7 +321,8 @@@ function(write_compiler_detection_heade
GNU
Clang
AppleClang
+MSVC
+ SunPro
)
set(_hex_compilers ADSP Borland Embarcadero SunPro)
diff --cc Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index cfaa78c,b725919..3d8bf31
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@@ -11,7 -11,7 +11,7 @@@ get_property(c_known_features GLOBAL PR
write_compiler_detection_header(
FILE ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h
PREFIX TEST
- COMPILERS GNU Clang AppleClang MSVC
- COMPILERS GNU Clang AppleClang SunPro
++ COMPILERS GNU Clang AppleClang MSVC SunPro
VERSION 3.1
PROLOG // something
EPILOG // more
@@@ -93,7 -82,7 +94,7 @@@ write_compiler_detection_header
PREFIX MULTI
OUTPUT_FILES_VAR multi_files
OUTPUT_DIR
${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support
- COMPILERS GNU Clang AppleClang MSVC
- COMPILERS GNU Clang AppleClang SunPro
++ COMPILERS GNU Clang AppleClang MSVC SunPro
VERSION 3.1
FEATURES
${cxx_known_features} ${c_known_features}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adfba79088fa3370fc9d77082e0aaedf045851e6
commit adfba79088fa3370fc9d77082e0aaedf045851e6
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 12:50:24 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jan 19 12:50:24 2015 -0500
Features: Temporarily exclude MSVC from Link Feature tests.
While we are working on figuring out the best way to detect a C++ feature
cycle with MSVC disable these tests. This will allow us to verify the rest
of the MSVC Feature tests are working properly.
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 1892a5c..f890f24 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -27,8 +27,10 @@ if (NOT CXX_FEATURES)
run_cmake(NoSupportedCxxFeatures)
run_cmake(NoSupportedCxxFeaturesGenex)
else()
- run_cmake(LinkImplementationFeatureCycle)
- run_cmake(LinkImplementationFeatureCycleSolved)
+ if(NOT MSVC)
+run_cmake(LinkImplementationFeatureCycle)
+run_cmake(LinkImplementationFeatureCycleSolved)
+ endif()
if (;${CXX_FEATURES}; MATCHES ;cxx_final;)
set
[Cmake-commits] CMake branch, next, updated. v3.1.0-2215-g7b307f3
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 7b307f3eb0a5cbc044370754a6b5883bf22c7e07 (commit)
via d275eb11df7a090b5fb42882690783b5296619c6 (commit)
via 9ab6fd968501383f1ab3e54a28ab3c51b84b47ac (commit)
from 4bb9d1e3dfe398e2835387cf1dd0b9c753fbf7d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b307f3eb0a5cbc044370754a6b5883bf22c7e07
commit 7b307f3eb0a5cbc044370754a6b5883bf22c7e07
Merge: 4bb9d1e d275eb1
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 15:50:44 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 19 15:50:44 2015 -0500
Merge topic 'feature-record-msvc' into next
d275eb11 Features: Record for MSVC 2010-2015.
9ab6fd96 Features: Exclude MSVC from Link Feature tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d275eb11df7a090b5fb42882690783b5296619c6
commit d275eb11df7a090b5fb42882690783b5296619c6
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 15:49:06 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jan 19 15:49:06 2015 -0500
Features: Record for MSVC 2010-2015.
Co-Author:Stephen Kelly steve...@gmail.com
Notes:
Initializer lists are only properly supported in 2015 and above.
Previous Visual Studio releases said they supported initializer lists
VS2012 and above to conform to cxx_decltype_incomplete_return_types
proposal, but without support for auto return types, the feature is unusable
so only state support in VS2015 and above.
VS2010 and above to conform to the updated cxx_contextual_conversions
proposal.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
new file mode 100644
index 000..476f244
--- /dev/null
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -0,0 +1,100 @@
+
+# Reference: http://msdn.microsoft.com/en-us/library/vstudio/hh567368.aspx
+#
http://blogs.msdn.com/b/vcblog/archive/2013/06/28/c-11-14-stl-features-fixes-and-breaking-changes-in-vs-2013.aspx
+#
http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
+# http://www.visualstudio.com/en-us/news/vs2015-preview-vs.aspx
+
+
+set(_cmake_oldestSupported _MSC_VER = 1600)
+
+set(MSVC_2015 _MSC_VER = 1900)
+set(_cmake_feature_test_cxx_alignas ${MSVC_2015})
+set(_cmake_feature_test_cxx_alignof ${MSVC_2015})
+set(_cmake_feature_test_cxx_binary_literals ${MSVC_2015})
+set(_cmake_feature_test_cxx_decltype_auto ${MSVC_2015})
+# In theory decltype incomplete return types was added in 2012
+# but without support for decltype_auto and return type deduction this
+# feature is unusable
+set(_cmake_feature_test_cxx_decltype_incomplete_return_types ${MSVC_2015})
+set(_cmake_feature_test_cxx_digit_separators ${MSVC_2015})
+set(_cmake_feature_test_cxx_func_identifier ${MSVC_2015})
+#
http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
+# Note 1. While previous version of VisualStudio said they supported this
+# they silently produced bad code, and are now marked as having partial
+# support
+set(_cmake_feature_test_cxx_generalized_initializers ${MSVC_2015})
+set(_cmake_feature_test_cxx_generic_lambdas ${MSVC_2015})
+set(_cmake_feature_test_cxx_inheriting_constructors ${MSVC_2015})
+set(_cmake_feature_test_cxx_inline_namespaces ${MSVC_2015})
+set(_cmake_feature_test_cxx_lambda_init_captures ${MSVC_2015})
+set(_cmake_feature_test_cxx_noexcept ${MSVC_2015})
+set(_cmake_feature_test_cxx_return_type_deduction ${MSVC_2015})
+set(_cmake_feature_test_cxx_sizeof_member ${MSVC_2015})
+set(_cmake_feature_test_cxx_thread_local ${MSVC_2015})
+set(_cmake_feature_test_cxx_unicode_literals ${MSVC_2015})
+set(_cmake_feature_test_cxx_unrestricted_unions ${MSVC_2015})
+set(_cmake_feature_test_cxx_user_literals ${MSVC_2015})
+
+set(MSVC_2013 _MSC_VER = 1800)
+set(_cmake_feature_test_cxx_alias_templates ${MSVC_2013})
+set(_cmake_feature_test_cxx_default_function_template_args ${MSVC_2013})
+set(_cmake_feature_test_cxx_defaulted_functions ${MSVC_2013})
+set(_cmake_feature_test_cxx_delegating_constructors ${MSVC_2013})
+set(_cmake_feature_test_cxx_deleted_functions ${MSVC_2013})
+set(_cmake_feature_test_cxx_explicit_conversions ${MSVC_2013})
+set(_cmake_feature_test_cxx_nonstatic_member_init ${MSVC_2013})
+set(_cmake_feature_test_cxx_raw_string_literals ${MSVC_2013})
+set(_cmake_feature_test_cxx_uniform_initialization ${MSVC_2013})
+# Possibly broken:
+# http://thread.gmane.org
[Cmake-commits] CMake branch, next, updated. v3.1.0-2210-gb37304e
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 b37304eb1acedcd57c40a0eedc6c93e5db21027f (commit)
via b8f3ed834c03bbe4a1eb61041f6c650f31601743 (commit)
via ee51008df2b4120eac0ff072090d528174c3cfd9 (commit)
via 73bb00ad863be2e54cce4abe43f3e24ea2c5a720 (commit)
via 4daddae7099c3faa18c7f7aad8bb363b70e9623d (commit)
via 5c02d2be180b8e0b16206cf56ac41324435f0188 (commit)
from 9b7ab08044e7d024e225efb44835153f53c6c1dd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b37304eb1acedcd57c40a0eedc6c93e5db21027f
commit b37304eb1acedcd57c40a0eedc6c93e5db21027f
Merge: 9b7ab08 b8f3ed8
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 15:02:25 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 19 15:02:25 2015 -0500
Merge topic 'feature-record-msvc' into next
b8f3ed83 Features: Exclude MSVC from Link Feature tests.
ee51008d Features: Enable writing of MSVC compiler feature header.
73bb00ad Features: Record for MSVC 2010-2015.
4daddae7 Features: Record for MSVC 2010-2013.
5c02d2be Extend test for MSVC.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8f3ed834c03bbe4a1eb61041f6c650f31601743
commit b8f3ed834c03bbe4a1eb61041f6c650f31601743
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jan 19 12:50:24 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jan 19 15:01:45 2015 -0500
Features: Exclude MSVC from Link Feature tests.
Compilers such as MSVC have no explicit flags to enable C++11/14/17 mode,
instead the compiler comes with a set list of supported features. This
combined
with the fact that MSVC has no C++ ABI compatibility means that this test is
not needed for MSVC.
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 1892a5c..f890f24 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -27,8 +27,10 @@ if (NOT CXX_FEATURES)
run_cmake(NoSupportedCxxFeatures)
run_cmake(NoSupportedCxxFeaturesGenex)
else()
- run_cmake(LinkImplementationFeatureCycle)
- run_cmake(LinkImplementationFeatureCycleSolved)
+ if(NOT MSVC)
+run_cmake(LinkImplementationFeatureCycle)
+run_cmake(LinkImplementationFeatureCycleSolved)
+ endif()
if (;${CXX_FEATURES}; MATCHES ;cxx_final;)
set(RunCMake_TEST_OPTIONS -DHAVE_FINAL=1)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee51008df2b4120eac0ff072090d528174c3cfd9
commit ee51008df2b4120eac0ff072090d528174c3cfd9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Jan 15 13:14:53 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jan 19 15:01:45 2015 -0500
Features: Enable writing of MSVC compiler feature header.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake
b/Modules/WriteCompilerDetectionHeader.cmake
index e81bc08..5642c99 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -36,7 +36,7 @@
# PREFIX ClimbingStats
# OUTPUT_FILES_VAR support_files
# OUTPUT_DIR compilers
-# COMPILERS GNU Clang
+# COMPILERS GNU Clang MSVC
# FEATURES cxx_variadic_templates
#)
#install(FILES
@@ -100,7 +100,7 @@
#write_compiler_detection_header(
# FILE climbingstats_compiler_detection.h
# PREFIX ClimbingStats
-# COMPILERS GNU Clang AppleClang
+# COMPILERS GNU Clang AppleClang MSVC
# FEATURES cxx_variadic_templates
#)
#
@@ -321,6 +321,7 @@ function(write_compiler_detection_header
GNU
Clang
AppleClang
+MSVC
SunPro
)
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index b5e46c0..43e89ab 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -11,7 +11,7 @@ get_property(c_known_features GLOBAL PROPERTY
CMAKE_C_KNOWN_FEATURES)
write_compiler_detection_header(
FILE ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h
PREFIX TEST
- COMPILERS GNU Clang AppleClang SunPro
+ COMPILERS GNU Clang AppleClang MSVC SunPro
VERSION 3.1
PROLOG // something
EPILOG // more
@@ -67,6 +67,18 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
endif()
+# for msvc the compiler version determines which c++11
[Cmake-commits] CMake branch, next, updated. v3.1.0-1508-g7d6c29f
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 7d6c29fc162f8977700c590f868800779de2594f (commit)
via b4e54f9b8c748f78d16e9da055a7e0436d7654ef (commit)
from 007b0452b5f7e536f1f88b30bcc5331227cbb098 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d6c29fc162f8977700c590f868800779de2594f
commit 7d6c29fc162f8977700c590f868800779de2594f
Merge: 007b045 b4e54f9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Jan 7 11:26:49 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 7 11:26:49 2015 -0500
Merge topic 'FindCUDA.cmake/UseCMAKE_CXX_FLAGS_separableCompilation' into
next
b4e54f9b FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable
compilation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4e54f9b8c748f78d16e9da055a7e0436d7654ef
commit b4e54f9b8c748f78d16e9da055a7e0436d7654ef
Author: James Bigler jamesbig...@gmail.com
AuthorDate: Tue Jan 6 16:28:05 2015 -0700
Commit: James Bigler jamesbig...@gmail.com
CommitDate: Tue Jan 6 16:28:05 2015 -0700
FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilation
Previously only the CMAKE_{C,CXX}_FLAGS_CONFIG flags were inspected
for relevant flags when compiling the intermediate link file. We need
to also consider the configuration agnostic flags, CMAKE_{C,CXX}_FLAGS
as well.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 29bb875..b420005 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1423,7 +1423,8 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS
output_file cuda_target options
if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
list(APPEND nvcc_flags -ccbin \${CUDA_HOST_COMPILER}\)
endif()
-# Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG}
+
+# Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG} and
CMAKE_${CUDA_C_OR_CXX}_FLAGS*
set(config_specific_flags)
set(flags)
foreach(config ${CUDA_configuration_types})
@@ -1438,6 +1439,13 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS
output_file cuda_target options
list(APPEND flags $$CONFIG:${config}:-Xcompiler
$$CONFIG:${config}:${f})
endforeach()
endforeach()
+# Add CMAKE_${CUDA_C_OR_CXX}_FLAGS
+set(important_host_flags)
+_cuda_get_important_host_flags(important_host_flags
${CMAKE_${CUDA_C_OR_CXX}_FLAGS})
+foreach(f ${important_host_flags})
+ list(APPEND flags -Xcompiler ${f})
+endforeach()
+
# Add our general CUDA_NVCC_FLAGS with the configuration specifig flags
set(nvcc_flags ${CUDA_NVCC_FLAGS} ${config_specific_flags} ${nvcc_flags})
---
Summary of changes:
Modules/FindCUDA.cmake | 10 +-
1 file changed, 9 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, next, updated. v3.1.0-1470-g383c5f1
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 383c5f1b1956818c4c2f5d4fd19c1a7283a8f7f3 (commit)
via 51b7afe48fe8b6256a850620764b3ab090af08a5 (commit)
via e77371108755670a8f49fac8059796bb61c5abad (commit)
via ef26ddcdf1de2da802a07b483fe36dc840e8e4ff (commit)
via 0a8ad952382a3ee036173480bd0dd946b15a3eb7 (commit)
from af5d9cd265bea1b7fedffdcd38f94bd9e92687ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=383c5f1b1956818c4c2f5d4fd19c1a7283a8f7f3
commit 383c5f1b1956818c4c2f5d4fd19c1a7283a8f7f3
Merge: af5d9cd 51b7afe
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jan 2 09:12:39 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 2 09:12:39 2015 -0500
Merge topic 'feature_record_msvc' into next
51b7afe4 Features: Enable writing of MSVC compiler feature header.
e7737110 Features: Record for MSVC 2015.
ef26ddcd Features: Record for MSVC 2010-2013.
0a8ad952 CompileFeatures: Handle compilers that don't support cxx_final.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51b7afe48fe8b6256a850620764b3ab090af08a5
commit 51b7afe48fe8b6256a850620764b3ab090af08a5
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Dec 22 13:45:18 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Fri Jan 2 09:10:49 2015 -0500
Features: Enable writing of MSVC compiler feature header.
Notes:
VS2015 and above are the only MSVC versions to support cxx_final, so remove
usages from the tests, and instead only test for cxx_override.
VS2012 and above to conform to cxx_decltype_incomplete_return_types
proposal, but without support for auto return types the dcl.type.simple
example in the proposal doesn't compile.
VS2013 and above to conform to the updated cxx_contextual_conversions
proposal, but VS2010 and above pass the test. I am hesitant to say that VS2010
and above meet all the requirements of the proposal currently.
Compilers such as MSVC have no explicit flags to enable C++11 mode,
it just is always on. So only run the link tests with compilers that require
a flag to specify the language version.
diff --git a/Modules/Compiler/MSVC-C-FeatureTests.cmake
b/Modules/Compiler/MSVC-C-FeatureTests.cmake
new file mode 100644
index 000..64016bc
--- /dev/null
+++ b/Modules/Compiler/MSVC-C-FeatureTests.cmake
@@ -0,0 +1,24 @@
+
+# Reference: http://msdn.microsoft.com/en-us/library/vstudio/hh567368.aspx
+#
http://blogs.msdn.com/b/vcblog/archive/2013/06/28/c-11-14-stl-features-fixes-and-breaking-changes-in-vs-2013.aspx
+#
http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
+# http://www.visualstudio.com/en-us/news/vs2015-preview-vs.aspx
+
+set(_cmake_oldestSupported _MSC_VER = 1300)
+
+#currently disabling everything while we test
+set(MSVC_2010 _MSC_VER = 1600)
+set(_cmake_feature_test_c_static_assert ${MSVC_2010})
+set(_cmake_feature_test_c_variadic_macros ${MSVC_2010})
+
+set(MSVC_2003 _MSC_VER = 1300)
+set(_cmake_feature_test_c_function_prototypes ${MSVC_2003})
+
+# Currently unsupported:
+#restrict requires the __restrict syntax in msvc
+#set(_cmake_feature_test_c_restrict)
+
+#Unset all the variables that we don't need exposed.
+#_cmake_oldestSupported is required by WriteCompilerDetectionHeader
+set(MSVC_2010)
+set(MSVC_2003)
\ No newline at end of file
diff --git a/Modules/WriteCompilerDetectionHeader.cmake
b/Modules/WriteCompilerDetectionHeader.cmake
index 36b9706..bcaaafa 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -36,7 +36,7 @@
# PREFIX ClimbingStats
# OUTPUT_FILES_VAR support_files
# OUTPUT_DIR compilers
-# COMPILERS GNU Clang
+# COMPILERS GNU Clang MSVC
# FEATURES cxx_variadic_templates
#)
#install(FILES
@@ -100,7 +100,7 @@
#write_compiler_detection_header(
# FILE climbingstats_compiler_detection.h
# PREFIX ClimbingStats
-# COMPILERS GNU Clang AppleClang
+# COMPILERS GNU Clang AppleClang MSVC
# FEATURES cxx_variadic_templates
#)
#
@@ -316,6 +316,7 @@ function(write_compiler_detection_header
GNU
Clang
AppleClang
+MSVC
)
set(_hex_compilers ADSP Borland Embarcadero SunPro)
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index ff5d745..d6f39bf 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -1,5 +1,5
[Cmake-commits] CMake branch, next, updated. v3.1.0-1473-g35eaf58
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 35eaf58f91224691aa0f68bfb61d866f695db936 (commit)
via 07fb7d435dd71aea389d9d89ffd4ef5aa14f1750 (commit)
via dd36560b72a7f3bb0325f29d9c4c7df2c8ed3f46 (commit)
from 383c5f1b1956818c4c2f5d4fd19c1a7283a8f7f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35eaf58f91224691aa0f68bfb61d866f695db936
commit 35eaf58f91224691aa0f68bfb61d866f695db936
Merge: 383c5f1 07fb7d4
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jan 2 09:26:24 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 2 09:26:24 2015 -0500
Merge topic 'feature_record_msvc' into next
07fb7d43 Fixup comments in commit: Enable writing of MSVC
dd36560b Fixup comments in commit: Record for MSVC 2015.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07fb7d435dd71aea389d9d89ffd4ef5aa14f1750
commit 07fb7d435dd71aea389d9d89ffd4ef5aa14f1750
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jan 2 09:23:57 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Fri Jan 2 09:25:54 2015 -0500
Fixup comments in commit: Enable writing of MSVC
diff --git a/Modules/Compiler/MSVC-C-FeatureTests.cmake
b/Modules/Compiler/MSVC-C-FeatureTests.cmake
index 64016bc..e449358 100644
--- a/Modules/Compiler/MSVC-C-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-C-FeatureTests.cmake
@@ -6,7 +6,6 @@
set(_cmake_oldestSupported _MSC_VER = 1300)
-#currently disabling everything while we test
set(MSVC_2010 _MSC_VER = 1600)
set(_cmake_feature_test_c_static_assert ${MSVC_2010})
set(_cmake_feature_test_c_variadic_macros ${MSVC_2010})
@@ -15,10 +14,10 @@ set(MSVC_2003 _MSC_VER = 1300)
set(_cmake_feature_test_c_function_prototypes ${MSVC_2003})
# Currently unsupported:
-#restrict requires the __restrict syntax in msvc
-#set(_cmake_feature_test_c_restrict)
+# restrict requires the __restrict syntax in msvc
+# set(_cmake_feature_test_c_restrict)
-#Unset all the variables that we don't need exposed.
-#_cmake_oldestSupported is required by WriteCompilerDetectionHeader
+# Unset all the variables that we don't need exposed.
+# _cmake_oldestSupported is required by WriteCompilerDetectionHeader
set(MSVC_2010)
set(MSVC_2003)
\ No newline at end of file
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index d6f39bf..48abb5c 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -29,12 +29,11 @@ endforeach()
get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-#blacklist for msvc
if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
list(REMOVE_ITEM cxx_features
-#This test requires auto return type deduction to work properly, but
-#that is not supported by all versions of MSVC that support decltype
-#incomplete return types.
+# This test requires auto return type deduction to work properly, but
+# that is not supported by all versions of MSVC that support decltype
+# incomplete return types.
cxx_decltype_incomplete_return_types
)
endif()
@@ -64,9 +63,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
list(REMOVE_ITEM CXX_non_features
-#Micrsoft only officially supports this feature in VS2013 and above, due
-#to new wording of the proposal. We don't test for this with MSVC because
-#older compiler pass the test but might not actually conform
+# Micrsoft only officially supports this feature in VS2013 and above, due
+# to new wording of the proposal. We don't test for this with MSVC because
+# older compiler pass the test but might not actually conform
cxx_contextual_conversions
)
endif()
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index cbfe3f3..cfaa78c 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -64,9 +64,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
endif()
-#for msvc the version determines if we support delegating constructors
-#and variadic templates. Luckily support for both of these features was
-#added in the same msvc version (1800)
+# for msvc the compiler version determines which c++11 features are available.
+# Both variadic templates and delegating constructors support exist in
+# all versions that we write compile headers
[Cmake-commits] CMake branch, next, updated. v3.1.0-1476-g625dde5
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 625dde5e7f890a840160408c4b494a454e61fbae (commit)
via 80b31347051db23291ff0d2ba0a4d5075a0f8c50 (commit)
via 7272bd3e60e07879f526b3cd42ae965fe047c62f (commit)
from 35eaf58f91224691aa0f68bfb61d866f695db936 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=625dde5e7f890a840160408c4b494a454e61fbae
commit 625dde5e7f890a840160408c4b494a454e61fbae
Merge: 35eaf58 80b3134
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jan 2 09:32:58 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 2 09:32:58 2015 -0500
Merge topic 'feature_record_msvc' into next
80b31347 Features: Enable writing of MSVC compiler feature header.
7272bd3e Features: Record for MSVC C++ 2015 and MSVC C 2010-2015.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80b31347051db23291ff0d2ba0a4d5075a0f8c50
commit 80b31347051db23291ff0d2ba0a4d5075a0f8c50
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jan 2 09:30:28 2015 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Fri Jan 2 09:32:13 2015 -0500
Features: Enable writing of MSVC compiler feature header.
Notes:
VS2015 and above are the only MSVC versions to support cxx_final, so remove
usages from the tests, and instead only test for cxx_override.
VS2012 and above to conform to cxx_decltype_incomplete_return_types
proposal, but without support for auto return types the dcl.type.simple
example in the proposal doesn't compile.
VS2013 and above to conform to the updated cxx_contextual_conversions
proposal, but VS2010 and above pass the test.
Compilers such as MSVC have no explicit flags to enable C++11 mode,
it just is always on. So only run the link tests with compilers that require
a flag to specify the language version.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake
b/Modules/WriteCompilerDetectionHeader.cmake
index 36b9706..bcaaafa 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -36,7 +36,7 @@
# PREFIX ClimbingStats
# OUTPUT_FILES_VAR support_files
# OUTPUT_DIR compilers
-# COMPILERS GNU Clang
+# COMPILERS GNU Clang MSVC
# FEATURES cxx_variadic_templates
#)
#install(FILES
@@ -100,7 +100,7 @@
#write_compiler_detection_header(
# FILE climbingstats_compiler_detection.h
# PREFIX ClimbingStats
-# COMPILERS GNU Clang AppleClang
+# COMPILERS GNU Clang AppleClang MSVC
# FEATURES cxx_variadic_templates
#)
#
@@ -316,6 +316,7 @@ function(write_compiler_detection_header
GNU
Clang
AppleClang
+MSVC
)
set(_hex_compilers ADSP Borland Embarcadero SunPro)
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index ff5d745..48abb5c 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
project(CompileFeatures)
@@ -26,18 +26,29 @@ get_property(c_features GLOBAL PROPERTY
CMAKE_C_KNOWN_FEATURES)
foreach(feature ${c_features})
run_test(${feature} C)
endforeach()
+
get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
+ list(REMOVE_ITEM cxx_features
+# This test requires auto return type deduction to work properly, but
+# that is not supported by all versions of MSVC that support decltype
+# incomplete return types.
+cxx_decltype_incomplete_return_types
+)
+endif()
+
foreach(feature ${cxx_features})
run_test(${feature} CXX)
endforeach()
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
list(REMOVE_ITEM CXX_non_features
cxx_alignof
)
endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
# GNU prior to 4.9 does not set any preprocessor define to distinguish
# c++1y from c++11, so CMake does not support c++1y features before GNU 4.9.
@@ -50,6 +61,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
cxx_return_type_deduction
)
endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
+ list(REMOVE_ITEM CXX_non_features
+# Micrsoft only officially supports this feature in VS2013 and above, due
+# to new wording of the proposal. We don't test for this with MSVC
[Cmake-commits] CMake branch, next, updated. v3.1.0-1443-g8ad33e0
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 8ad33e01d2ed27c9ac136fd19516a21449b4c87b (commit)
via b97c86b5009307e6b089bcc2ddef55d77918f765 (commit)
via 2c528f860ff8ea458fbf8ab6c85908aeeaa749e0 (commit)
from ff99adb80d59dcbe8cb0d9dc12db657a2f58be7e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ad33e01d2ed27c9ac136fd19516a21449b4c87b
commit 8ad33e01d2ed27c9ac136fd19516a21449b4c87b
Merge: ff99adb b97c86b
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Dec 31 10:29:37 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 31 10:29:37 2014 -0500
Merge topic 'feature_record_msvc' into next
b97c86b5 CompileFeatures: Support compilers that don't have version modess.
2c528f86 CompileFeatures: NonValidTarget1 now handles not have cxx_final.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b97c86b5009307e6b089bcc2ddef55d77918f765
commit b97c86b5009307e6b089bcc2ddef55d77918f765
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Dec 31 10:27:24 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Dec 31 10:27:24 2014 -0500
CompileFeatures: Support compilers that don't have version modess.
compilers such as MSVC have no explicit flags to enable C++11 mode,
it just is always on. So only run the link tests with compilers that require
a flag to specify the language version.
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 1892a5c..e4abed5 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -27,8 +27,13 @@ if (NOT CXX_FEATURES)
run_cmake(NoSupportedCxxFeatures)
run_cmake(NoSupportedCxxFeaturesGenex)
else()
- run_cmake(LinkImplementationFeatureCycle)
- run_cmake(LinkImplementationFeatureCycleSolved)
+ #compilers such as MSVC have no explicit flags to enable C++11 mode,
+ #it just is always on. So only run the link tests with compilers that require
+ #a flag to specify the language version.
+ if(CMAKE_CXX11_STANDARD_COMPILE_OPTION)
+run_cmake(LinkImplementationFeatureCycle)
+run_cmake(LinkImplementationFeatureCycleSolved)
+ endif()
if (;${CXX_FEATURES}; MATCHES ;cxx_final;)
set(RunCMake_TEST_OPTIONS -DHAVE_FINAL=1)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c528f860ff8ea458fbf8ab6c85908aeeaa749e0
commit 2c528f860ff8ea458fbf8ab6c85908aeeaa749e0
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Dec 31 10:25:33 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Dec 31 10:25:33 2014 -0500
CompileFeatures: NonValidTarget1 now handles not have cxx_final.
Previously we expanded HAVE_FINAL to determine what the copied_file number
would be, but when we don't have cxx_final than HAVE_FINAL is not defined.
What we really want is to use expected_result.
diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
index c6707c1..b544b99 100644
--- a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
+++ b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
@@ -7,7 +7,7 @@ else()
set(expected_result 0)
endif()
-add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/copied_file${HAVE_FINAL}.cpp
+add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp
${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp
)
---
Summary of changes:
Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake |2 +-
Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake|9 +++--
2 files changed, 8 insertions(+), 3 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.1.0-1413-gcad7445
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 cad7445c492ece031d0521f4dc04ea05bf4770a7 (commit)
via 61348b0dcb21da79f2a397899f13b1869e842803 (commit)
via b27b068b6bf968e06e50184b8bae689d52b59f91 (commit)
via a07ece6a437b889d64818333b6ec99da5a1f078c (commit)
via d8f626b35ce1c51de3eca7fbd846e12e121788b4 (commit)
from 55efb6d191007eef921df832bae9ff014f85cd57 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad7445c492ece031d0521f4dc04ea05bf4770a7
commit cad7445c492ece031d0521f4dc04ea05bf4770a7
Merge: 55efb6d 61348b0
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 12:23:17 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 30 12:23:17 2014 -0500
Merge topic 'feature_record_msvc' into next
61348b0d Features: Don't test cxx_contextual_conversions with MSVC.
b27b068b Features: MSVC trailing_return_types support was added in 2010.
a07ece6a Try and get compile features test to work with MSVC2010 - 2013
d8f626b3 Features: cxx_trailing_return_types was supported in MSVC 2013.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61348b0dcb21da79f2a397899f13b1869e842803
commit 61348b0dcb21da79f2a397899f13b1869e842803
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 12:21:33 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Dec 30 12:21:33 2014 -0500
Features: Don't test cxx_contextual_conversions with MSVC.
VS2013 and above to conform to the updated cxx_contextual_conversions
proposal,
but VS2010 and above pass the test. I am hesitant to say that VS2010 and
above
meet all the requirements of the proposal currently.
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index 0ff8ea4..52524f9 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -50,6 +50,13 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
cxx_return_type_deduction
)
endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
+ list(REMOVE_ITEM CXX_non_features
+#Micrsoft only officially supports this feature in VS2013 and above, due
+#to new wording of the proposal. We don't test for this with MSVC because
+#older compiler pass the test but might not actually conform
+cxx_contextual_conversions
+)
set(C_ext c)
set(C_standard_flag 11)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b27b068b6bf968e06e50184b8bae689d52b59f91
commit b27b068b6bf968e06e50184b8bae689d52b59f91
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 12:21:07 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Dec 30 12:21:07 2014 -0500
Features: MSVC trailing_return_types support was added in 2010.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 2a557b1..50e0cbe 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -37,7 +37,6 @@ set(_cmake_feature_test_cxx_explicit_conversions
${MSVC_2013})
set(_cmake_feature_test_cxx_generalized_initializers ${MSVC_2013})
set(_cmake_feature_test_cxx_nonstatic_member_init ${MSVC_2013})
set(_cmake_feature_test_cxx_raw_string_literals ${MSVC_2013})
-set(_cmake_feature_test_cxx_trailing_return_types ${MSVC_2013})
set(_cmake_feature_test_cxx_uniform_initialization ${MSVC_2013})
# Possibly broken:
# http://thread.gmane.org/gmane.comp.lib.boost.devel/244986/focus=245333
@@ -69,6 +68,7 @@ set(_cmake_feature_test_cxx_right_angle_brackets
${MSVC_2010})
set(_cmake_feature_test_cxx_rvalue_references ${MSVC_2010})
set(_cmake_feature_test_cxx_static_assert ${MSVC_2010})
set(_cmake_feature_test_cxx_template_template_parameters ${MSVC_2010})
+set(_cmake_feature_test_cxx_trailing_return_types ${MSVC_2010})
set(_cmake_feature_test_cxx_variadic_macros ${MSVC_2010})
# Currently unsupported:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a07ece6a437b889d64818333b6ec99da5a1f078c
commit a07ece6a437b889d64818333b6ec99da5a1f078c
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 11:56:59 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Dec 30 11:56:59 2014 -0500
Try and get compile features test to work with MSVC2010 - 2013
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index ff5d745..0ff8ea4 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures
[Cmake-commits] CMake branch, next, updated. v3.1.0-1423-gce73c53
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 ce73c53c7a64d31432739f434f222cfa904c1aec (commit)
via edcf86ec3a75e89ce3805c6db371b98b1adeb16e (commit)
via a114dfa05df5936c312645171b741ac8279ad1d9 (commit)
via 1a6b7625ffdb65ed0433bfab9676df6552e8e0cb (commit)
via f79180f555b3e92b456fde6a5d033128a47c6d4f (commit)
via 6c8e8e6db6e38c7e89f1932874ebb73293ca4f56 (commit)
via 85c494047afcdc5fa05965ca0dddf6fd5f44d4d0 (commit)
via 9dfde24f8fb3ae25da5814168fff4083231f6b85 (commit)
from 8cdd0d4208bb8782049cdc750bd516f96d5b5cba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce73c53c7a64d31432739f434f222cfa904c1aec
commit ce73c53c7a64d31432739f434f222cfa904c1aec
Merge: 8cdd0d4 edcf86e
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 17:11:44 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 30 17:11:44 2014 -0500
Merge topic 'feature_record_msvc' into next
edcf86ec Features: Don't test cxx_decltype_incomplete_return_types with
MSVC.
a114dfa0 Feature: Correct initializer lists to be supported in 2015 and
above.
1a6b7625 Compile Features: Can't use final as only MSVC 2015 and above
support it.
f79180f5 Features: Teach windows msvc which are the default compiler
versions.
6c8e8e6d Features: test features actually supported by MSVC min supported.
85c49404 Features: Teach windows msvc which are the default compiler
versions.
9dfde24f Features: Don't test cxx_contextual_conversions with MSVC.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edcf86ec3a75e89ce3805c6db371b98b1adeb16e
commit edcf86ec3a75e89ce3805c6db371b98b1adeb16e
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 15:43:52 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Dec 30 16:25:06 2014 -0500
Features: Don't test cxx_decltype_incomplete_return_types with MSVC.
VS2012 and above to conform to cxx_decltype_incomplete_return_types
proposal, but without support for auto return types the dcl.type.simple
example in the proposal doesn't compile.
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index cc3dd9c..d6f39bf 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -26,7 +26,19 @@ get_property(c_features GLOBAL PROPERTY
CMAKE_C_KNOWN_FEATURES)
foreach(feature ${c_features})
run_test(${feature} C)
endforeach()
+
get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+
+#blacklist for msvc
+if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC)
+ list(REMOVE_ITEM cxx_features
+#This test requires auto return type deduction to work properly, but
+#that is not supported by all versions of MSVC that support decltype
+#incomplete return types.
+cxx_decltype_incomplete_return_types
+)
+endif()
+
foreach(feature ${cxx_features})
run_test(${feature} CXX)
endforeach()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a114dfa05df5936c312645171b741ac8279ad1d9
commit a114dfa05df5936c312645171b741ac8279ad1d9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Dec 30 16:00:29 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Dec 30 16:25:05 2014 -0500
Feature: Correct initializer lists to be supported in 2015 and above.
Previous Visual Studio releases said they supported initializer lists but
silently produced bad code.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 50e0cbe..2dba314 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -14,6 +14,11 @@ set(_cmake_feature_test_cxx_binary_literals ${MSVC_2015})
set(_cmake_feature_test_cxx_decltype_auto ${MSVC_2015})
set(_cmake_feature_test_cxx_digit_separators ${MSVC_2015})
set(_cmake_feature_test_cxx_func_identifier ${MSVC_2015})
+#
http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
+# Note 1. While previous version of VisualStudio said they supported this
+# they silently produced bad code, and are now marked as having partial
+# support
+set(_cmake_feature_test_cxx_generalized_initializers ${MSVC_2015})
set(_cmake_feature_test_cxx_generic_lambdas ${MSVC_2015})
set(_cmake_feature_test_cxx_inheriting_constructors ${MSVC_2015})
set(_cmake_feature_test_cxx_inline_namespaces ${MSVC_2015})
@@ -33,8 +38,6 @@ set
[Cmake-commits] CMake branch, next, updated. v3.1.0-1342-gb68c4f1
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 b68c4f1dcb517f04d208c892013a35ad562b4955 (commit) via 76a39f7a191ec42d90157c7d093b8cc97209c912 (commit) via dfb74f5255e8a5ef3af799b61fc0721968adbe28 (commit) via 2dc198b221391e33b4c1f204b1d7d4e2347369c8 (commit) via 309ffd8ef0e2da664cb459d06ca20f0838dadec3 (commit) via a7f55ac9f1b720a3338948f6c6883b3658f9d27b (commit) via 2c8b9f506a6b8bdb2a9f036c1c7566adf5d4c5ab (commit) from bf4483a2825783adfd1cbe3fa9256cafe1fac7b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b68c4f1dcb517f04d208c892013a35ad562b4955 commit b68c4f1dcb517f04d208c892013a35ad562b4955 Merge: bf4483a 76a39f7 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Dec 22 14:15:33 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Dec 22 14:15:33 2014 -0500 Merge topic 'better_custom_dmgs' into next 76a39f7a DragNDropGenerator Updated Documentation to include new variables. dfb74f52 DragNDropGenerator now manually computes the size of the temp dmg image. 2dc198b2 DragNDropGenerator copies the background image after the dmg is created. 309ffd8e DragNDropGenerator now can run an apple script when making a package. a7f55ac9 DragNDropGenerator now places the background image file in a hidden folder. 2c8b9f50 DragNDropGenerator background image now uses source file extension. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76a39f7a191ec42d90157c7d093b8cc97209c912 commit 76a39f7a191ec42d90157c7d093b8cc97209c912 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Thu Dec 18 14:56:37 2014 -0500 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Thu Dec 18 14:56:37 2014 -0500 DragNDropGenerator Updated Documentation to include new variables. The DragNDropGenerator documentation now covers the new behavior of CPACK_DMG_BACKGROUND_IMAGE and what the purpose of CPACK_DMG_DS_STORE_SETUP_SCRIPT is. diff --git a/Modules/CPackDMG.cmake b/Modules/CPackDMG.cmake index b7a6ba5..b4231e8 100644 --- a/Modules/CPackDMG.cmake +++ b/Modules/CPackDMG.cmake @@ -29,12 +29,23 @@ # the Finder (either manually or through OSA-script) using a normal folder # from which the .DS_Store file can then be extracted. # +# .. variable:: CPACK_DMG_DS_STORE_SETUP_SCRIPT +# +# Path to a custom OSA-script file. This apple script is used to +# the generate a .DS_Store file which specifies the Finder window +# position/geometry and layout (such as hidden toolbars, placement of the +# icons etc.). By specifying a custom apple script there is no need to +# CPACK_DMG_DS_STORE, as the .DS_Store that is generated by the OSA-script +# will be packaged. +# # .. variable:: CPACK_DMG_BACKGROUND_IMAGE # -# Path to a background image file. This file will be used as the background -# for the Finder Window when the disk image is opened. By default no -# background image is set. The background image is applied after applying the -# custom .DS_Store file. +# Path to an image file to be used as the background. This file will be copied +# to .background/background.ext, where ext is the original image file +# extension. The background image is installed into the image before +# CPACK_DMG_DS_STORE_SETUP_SCRIPT is executed or CPACK_DMG_DS_STORE is +# installed +# By default no background image is set. # # .. variable:: CPACK_COMMAND_HDIUTIL # http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfb74f5255e8a5ef3af799b61fc0721968adbe28 commit dfb74f5255e8a5ef3af799b61fc0721968adbe28 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Wed Oct 1 13:52:11 2014 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Thu Dec 18 14:39:05 2014 -0500 DragNDropGenerator now manually computes the size of the temp dmg image. When creating a DragNDrop bundle with a custom layout and background you need to make sure that the image size is large enough to store both the background and the custom .DS_Store. Now previously the DragNDropGenerator relied on the fact that both of these files would exist in the staging folder so it could let hdiutil compute an exact size. Now that we allow generation of the .DS_Store to happen after creation of the image we need to manually specify the size of the image to include room for the new .DS_Store and background. The whole reason why we have to delay the background image copy, is that if we let hdiutil package the background image it gets
[Cmake-commits] CMake branch, next, updated. v3.1.0-1344-g7d315d7
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 7d315d7e39a710fdf03b07388b4eec105a22e565 (commit)
via 4549f8efd4424ac0d8e8b874d30ac5b25c6f7516 (commit)
from b68c4f1dcb517f04d208c892013a35ad562b4955 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d315d7e39a710fdf03b07388b4eec105a22e565
commit 7d315d7e39a710fdf03b07388b4eec105a22e565
Merge: b68c4f1 4549f8e
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Dec 22 14:15:54 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 22 14:15:54 2014 -0500
Merge topic 'better_looking_mac_package' into next
4549f8ef CMake DragNDrop release now uses a custom background and script
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4549f8efd4424ac0d8e8b874d30ac5b25c6f7516
commit 4549f8efd4424ac0d8e8b874d30ac5b25c6f7516
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Sep 29 08:42:49 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Thu Dec 18 15:15:11 2014 -0500
CMake DragNDrop release now uses a custom background and script
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index aba404f..7488dc7 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -45,6 +45,12 @@ if(${CPACK_GENERATOR} STREQUAL PackageMaker)
endif()
endif()
+if(${CPACK_GENERATOR} STREQUAL DragNDrop)
+ set(CPACK_DMG_BACKGROUND_IMAGE @CMake_SOURCE_DIR@/CMakeDMGBackground.tif)
+ set(CPACK_DMG_DS_STORE_SETUP_SCRIPT
+ @CMake_SOURCE_DIR@/CMakeDMG_Setup_Script.scrpt)
+endif()
+
if(${CPACK_GENERATOR} STREQUAL WIX)
# Reset CPACK_PACKAGE_VERSION to deal with WiX restriction.
# But the file names still use the full CMake_VERSION value:
diff --git a/CMakeDMGBackground.tif b/CMakeDMGBackground.tif
new file mode 100644
index 000..91c4b13
Binary files /dev/null and b/CMakeDMGBackground.tif differ
diff --git a/CMakeDMG_Setup_Script.scrpt b/CMakeDMG_Setup_Script.scrpt
new file mode 100644
index 000..552c518
--- /dev/null
+++ b/CMakeDMG_Setup_Script.scrpt
@@ -0,0 +1,42 @@
+on run argv
+ set image_name to item 1 of argv
+
+ tell application Finder
+ tell disk image_name
+
+-- open the image the first time and save a DS_Store with just
+-- background and icon setup
+open
+ set current view of container window to icon view
+ set theViewOptions to the icon view options of container window
+ set background picture of theViewOptions to file
.background:background.tif
+ set arrangement of theViewOptions to not arranged
+ set icon size of theViewOptions to 128
+ delay 1
+close
+
+-- next setup the position of the app and Applications symlink
+-- plus hide all the window decoration
+open
+ update without registering applications
+ tell container window
+set sidebar width to 0
+set statusbar visible to false
+set toolbar visible to false
+set the bounds to { 400, 100, 900, 465 }
+set position of item CMake.app to { 133, 200 }
+set position of item Applications to { 378, 200 }
+ end tell
+ update without registering applications
+ delay 1
+close
+
+-- one last open and close so you can see everything looks correct
+open
+ delay 5
+close
+
+ end tell
+ delay 1
+end tell
+end run
\ No newline at end of file
---
Summary of changes:
CMakeCPackOptions.cmake.in |6 ++
CMakeDMGBackground.tif | Bin 0 - 95690 bytes
CMakeDMG_Setup_Script.scrpt | 42 ++
3 files changed, 48 insertions(+)
create mode 100644 CMakeDMGBackground.tif
create mode 100644 CMakeDMG_Setup_Script.scrpt
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.0.2-5570-gbf3796f
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 bf3796f41a88b99065df708f7c719fead8c0a60a (commit) via f4f13d34730585cd095eeced45f55d0be7afae85 (commit) from 3d5dd7db1f41269b266f76bf6e01c5490f57b22d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf3796f41a88b99065df708f7c719fead8c0a60a commit bf3796f41a88b99065df708f7c719fead8c0a60a Merge: 3d5dd7d f4f13d3 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Fri Oct 3 14:13:38 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Oct 3 14:13:38 2014 -0400 Merge topic 'clarify_size_t_docs' into next f4f13d34 Clarify the size_t developer documentation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4f13d34730585cd095eeced45f55d0be7afae85 commit f4f13d34730585cd095eeced45f55d0be7afae85 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Fri Oct 3 14:13:13 2014 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Fri Oct 3 14:13:13 2014 -0400 Clarify the size_t developer documentation. diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index cd979c9..625dac0 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -188,8 +188,8 @@ size_t Various implementations have differing implementation of ``size_t``. When assigning the result of ``.size()`` on a container for example, the result -should not be assigned to an ``unsigned int`` or similar. ``std::size_t`` must -not be used. +should be assigned to ``size_t`` not to ``std::size_t``, ``unsigned int`` or +similar types. Templates - --- Summary of changes: Help/manual/cmake-developer.7.rst |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-commits] CMake branch, next, updated. v3.0.2-5495-g7dd7436
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 7dd7436d6323304bc9b838267a6f5c180434943b (commit) via 3da328d38fda55f1683c4e033f17366493305349 (commit) from 9a25aaa24c16822e363ff15445c4a536156695e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dd7436d6323304bc9b838267a6f5c180434943b commit 7dd7436d6323304bc9b838267a6f5c180434943b Merge: 9a25aaa 3da328d Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Sep 29 10:02:40 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Sep 29 10:02:40 2014 -0400 Merge topic 'build_cmake_dmg_non_universal' into next 3da328d3 Make the OSX 10.6+ release x86_64 only. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3da328d38fda55f1683c4e033f17366493305349 commit 3da328d38fda55f1683c4e033f17366493305349 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Sep 29 10:00:57 2014 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Mon Sep 29 10:00:57 2014 -0400 Make the OSX 10.6+ release x86_64 only. We have no need for the 10.6+ bundle to be 32 and 64bit. For older 32bit machines they should be using the 10.4+ 32bit release. diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake index d332816..6c9b8f4 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/dashmacmini5_release.cmake @@ -14,7 +14,7 @@ OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcry OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a CMAKE_BUILD_TYPE:STRING=Release -CMAKE_OSX_ARCHITECTURES:STRING=x86_64;i386 +CMAKE_OSX_ARCHITECTURES:STRING=x86_64 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CPACK_SYSTEM_NAME:STRING=Darwin64-universal --- Summary of changes: Utilities/Release/dashmacmini5_release.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-commits] CMake branch, next, updated. v3.0.2-5439-g2040bb2
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 2040bb2a6f3ab2121af8b04dbc49b460384b6acd (commit)
via 561344553eeeddb314974917334c2f82621bfe88 (commit)
from da8aa48b29761f697f23995b31eeb3d6179b11c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2040bb2a6f3ab2121af8b04dbc49b460384b6acd
commit 2040bb2a6f3ab2121af8b04dbc49b460384b6acd
Merge: da8aa48 5613445
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Sep 24 10:21:08 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 24 10:21:08 2014 -0400
Merge topic 'build_cmake_dmg_with_bzip' into next
56134455 CMake now using bzip2 compression for mac release bundles.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=561344553eeeddb314974917334c2f82621bfe88
commit 561344553eeeddb314974917334c2f82621bfe88
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Sep 24 10:18:52 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Sep 24 10:18:52 2014 -0400
CMake now using bzip2 compression for mac release bundles.
Starting with OSX 10.4 dmg files offers bzip2 compression which offers
small package sizes.
diff --git a/Utilities/Release/dashmacmini5_release.cmake
b/Utilities/Release/dashmacmini5_release.cmake
index 16a30b3..d332816 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -7,6 +7,7 @@ set(MAKE_PROGRAM make)
set(MAKE ${MAKE_PROGRAM} -j5)
set(CPACK_BINARY_GENERATORS DragNDrop TGZ TZ)
set(CPACK_SOURCE_GENERATORS TGZ TZ)
+set(CPACK_DMG_FORMAT UDBZ) #build using bzip2 for smaller package size
set(INITIAL_CACHE
CMAKE_USE_OPENSSL:BOOL=ON
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
---
Summary of changes:
Utilities/Release/dashmacmini5_release.cmake |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
[Cmake-commits] CMake branch, next, updated. v3.0.2-5452-gc2768d6
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 c2768d6897864156f644c35caf332c945ff19685 (commit)
via 6b25938c35ef486af2e3d9af6482948d066f27c4 (commit)
from d32009a23a164d10e49b8f3e9508ec7c60b3fe88 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2768d6897864156f644c35caf332c945ff19685
commit c2768d6897864156f644c35caf332c945ff19685
Merge: d32009a 6b25938
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Sep 24 15:38:51 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 24 15:38:51 2014 -0400
Merge topic 'build_cmake_dmg_with_bzip' into next
6b25938c Update mac mini 2 release to use bzip2 compression.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b25938c35ef486af2e3d9af6482948d066f27c4
commit 6b25938c35ef486af2e3d9af6482948d066f27c4
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Sep 24 15:38:29 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Sep 24 15:38:29 2014 -0400
Update mac mini 2 release to use bzip2 compression.
diff --git a/Utilities/Release/dashmacmini2_release.cmake
b/Utilities/Release/dashmacmini2_release.cmake
index 6a27119..ba82aab 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -6,6 +6,7 @@ set(HOST dashmacmini2)
set(MAKE_PROGRAM make)
set(MAKE ${MAKE_PROGRAM} -j2)
set(CPACK_BINARY_GENERATORS DragNDrop TGZ TZ)
+set(CPACK_DMG_FORMAT UDBZ) #build using bzip2 for smaller package size
set(INITIAL_CACHE
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
---
Summary of changes:
Utilities/Release/dashmacmini2_release.cmake |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
[Cmake-commits] CMake branch, next, updated. v3.0.2-5454-g2ee6f7d
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 2ee6f7d43da4c5a3d466915f81c9775feb2c777e (commit)
via ffa5db962294b70130cf4a7401381a0fc7dc338d (commit)
from c2768d6897864156f644c35caf332c945ff19685 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ee6f7d43da4c5a3d466915f81c9775feb2c777e
commit 2ee6f7d43da4c5a3d466915f81c9775feb2c777e
Merge: c2768d6 ffa5db9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Sep 24 15:39:23 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 24 15:39:23 2014 -0400
Merge topic 'build_cmake_dmg_with_bzip' into next
ffa5db96 CMake now using bzip2 compression for mac release bundles.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffa5db962294b70130cf4a7401381a0fc7dc338d
commit ffa5db962294b70130cf4a7401381a0fc7dc338d
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Sep 24 10:18:52 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Sep 24 15:39:12 2014 -0400
CMake now using bzip2 compression for mac release bundles.
Starting with OSX 10.4 dmg files offers bzip2 compression which offers
small package sizes.
diff --git a/Utilities/Release/dashmacmini2_release.cmake
b/Utilities/Release/dashmacmini2_release.cmake
index 6a27119..ba82aab 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -6,6 +6,7 @@ set(HOST dashmacmini2)
set(MAKE_PROGRAM make)
set(MAKE ${MAKE_PROGRAM} -j2)
set(CPACK_BINARY_GENERATORS DragNDrop TGZ TZ)
+set(CPACK_DMG_FORMAT UDBZ) #build using bzip2 for smaller package size
set(INITIAL_CACHE
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
diff --git a/Utilities/Release/dashmacmini5_release.cmake
b/Utilities/Release/dashmacmini5_release.cmake
index 16a30b3..d332816 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -7,6 +7,7 @@ set(MAKE_PROGRAM make)
set(MAKE ${MAKE_PROGRAM} -j5)
set(CPACK_BINARY_GENERATORS DragNDrop TGZ TZ)
set(CPACK_SOURCE_GENERATORS TGZ TZ)
+set(CPACK_DMG_FORMAT UDBZ) #build using bzip2 for smaller package size
set(INITIAL_CACHE
CMAKE_USE_OPENSSL:BOOL=ON
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
---
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.0.0-4009-ga1fd401
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 a1fd40176eb1868b7c098b0fa64b13f89263d6fd (commit)
via dfb9aa284410099470f88231b1ac43900d00c67b (commit)
from 19fa615dde14d564b9e67d9066d1fa606d26e4c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1fd40176eb1868b7c098b0fa64b13f89263d6fd
commit a1fd40176eb1868b7c098b0fa64b13f89263d6fd
Merge: 19fa615 dfb9aa2
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 30 11:25:24 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 30 11:25:24 2014 -0400
Merge topic 'old_cuda_osx_clang' into next
dfb9aa28 Update the inline comment for why we resolve symlinks.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfb9aa284410099470f88231b1ac43900d00c67b
commit dfb9aa284410099470f88231b1ac43900d00c67b
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 30 11:24:59 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 30 11:24:59 2014 -0400
Update the inline comment for why we resolve symlinks.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 9e6e2a3..9348aa5 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -453,7 +453,10 @@ if(CMAKE_GENERATOR MATCHES Visual Studio)
set(CUDA_HOST_COMPILER $(VCInstallDir)bin CACHE FILEPATH Host side
compiler used by NVCC)
else()
# Using cc which is symlink to clang may let NVCC think it is GCC and issue
- # unhandled -dumpspecs option to clang.
+ # unhandled -dumpspecs option to clang. Also in case neither
+ # CMAKE_C_COMPILER is defined (project does not use C language) nor
+ # CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let
+ # nvcc use its own default C compiler.
if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
get_filename_component(c_compiler_realpath ${CMAKE_C_COMPILER} REALPATH)
else()
---
Summary of changes:
Modules/FindCUDA.cmake |5 -
1 file changed, 4 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, next, updated. v3.0.0-4011-g7448cd5
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 7448cd558c0aafcde567124b52f545d28f838543 (commit)
via 32bcec5fab8a92590bfc2efafe29f2403bbab4dd (commit)
from a1fd40176eb1868b7c098b0fa64b13f89263d6fd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7448cd558c0aafcde567124b52f545d28f838543
commit 7448cd558c0aafcde567124b52f545d28f838543
Merge: a1fd401 32bcec5
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 30 11:25:30 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 30 11:25:30 2014 -0400
Merge topic 'cuda_osx_clang' into next
32bcec5f FindCUDA: Fix OSX Clang no C language enabled
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32bcec5fab8a92590bfc2efafe29f2403bbab4dd
commit 32bcec5fab8a92590bfc2efafe29f2403bbab4dd
Author: Adam Strzelecki o...@java.pl
AuthorDate: Thu Jun 12 19:46:50 2014 +0200
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 30 11:23:36 2014 -0400
FindCUDA: Fix OSX Clang no C language enabled
When setting default CUDA_HOST_COMPILER we must dereference
CMAKE_C_COMPILER,
i.e. /usr/bin/clang should be used instead /usr/bin/cc which is symlink.
Otherwise CUDA thinks it is GCC and issues -dumpspecs which is unknown
option
to Clang.
Also in case neither CMAKE_C_COMPILER is defined (project does not use C
language) nor CUDA_HOST_COMPILER is specified manually we should skip -ccbin
and let nvcc use its own default C compiler.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index d9809ad..9348aa5 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -452,7 +452,17 @@ set(CUDA_NVCC_FLAGS CACHE STRING Semi-colon delimit
multiple arguments.)
if(CMAKE_GENERATOR MATCHES Visual Studio)
set(CUDA_HOST_COMPILER $(VCInstallDir)bin CACHE FILEPATH Host side
compiler used by NVCC)
else()
- set(CUDA_HOST_COMPILER ${CMAKE_C_COMPILER} CACHE FILEPATH Host side
compiler used by NVCC)
+ # Using cc which is symlink to clang may let NVCC think it is GCC and issue
+ # unhandled -dumpspecs option to clang. Also in case neither
+ # CMAKE_C_COMPILER is defined (project does not use C language) nor
+ # CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let
+ # nvcc use its own default C compiler.
+ if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
+get_filename_component(c_compiler_realpath ${CMAKE_C_COMPILER} REALPATH)
+ else()
+set(c_compiler_realpath )
+ endif()
+ set(CUDA_HOST_COMPILER ${c_compiler_realpath} CACHE FILEPATH Host side
compiler used by NVCC)
endif()
# Propagate the host flags to the host compiler via -Xcompiler
@@ -1422,7 +1432,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS
output_file cuda_target options
# If -ccbin, --compiler-bindir has been specified, don't do anything.
Otherwise add it here.
list( FIND nvcc_flags -ccbin ccbin_found0 )
list( FIND nvcc_flags --compiler-bindir ccbin_found1 )
-if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 )
+if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
list(APPEND nvcc_flags -ccbin \${CUDA_HOST_COMPILER}\)
endif()
# Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG}
diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake
index f0aac84..58e0d31 100644
--- a/Modules/FindCUDA/run_nvcc.cmake
+++ b/Modules/FindCUDA/run_nvcc.cmake
@@ -62,7 +62,7 @@ set(cmake_dependency_file @cmake_dependency_file@) # path
set(CUDA_make2cmake @CUDA_make2cmake@) # path
set(CUDA_parse_cubin @CUDA_parse_cubin@) # path
set(build_cubin @build_cubin@) # bool
-set(CUDA_HOST_COMPILER @CUDA_HOST_COMPILER@) # bool
+set(CUDA_HOST_COMPILER @CUDA_HOST_COMPILER@) # path
# We won't actually use these variables for now, but we need to set this, in
# order to force this file to be run again if it changes.
set(generated_file_path @generated_file_path@) # path
@@ -106,7 +106,7 @@ list(APPEND CUDA_NVCC_FLAGS
${CUDA_NVCC_FLAGS_${build_configuration}})
# Any -ccbin existing in CUDA_NVCC_FLAGS gets highest priority
list( FIND CUDA_NVCC_FLAGS -ccbin ccbin_found0 )
list( FIND CUDA_NVCC_FLAGS --compiler-bindir ccbin_found1 )
-if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 )
+if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
if (CUDA_HOST_COMPILER STREQUAL $(VCInstallDir)bin AND DEFINED CCBIN)
set(CCBIN -ccbin ${CCBIN})
else()
---
Summary of changes
[Cmake-commits] CMake branch, next, updated. v3.0.0-3995-g53ece55
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 53ece55f0bf137573118543409595c8b5bd4cf48 (commit)
via d0d2fdd4b55fa96c6964e908dc6361ec471456e7 (commit)
from b32b4cb4ec17e56f201dc92aea049ec2a062 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53ece55f0bf137573118543409595c8b5bd4cf48
commit 53ece55f0bf137573118543409595c8b5bd4cf48
Merge: b32b4cb d0d2fdd
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jun 27 16:58:50 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 27 16:58:50 2014 -0400
Merge topic 'cuda_osx_clang' into next
d0d2fdd4 FindCUDA: Fix OSX Clang no C language enabled
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0d2fdd4b55fa96c6964e908dc6361ec471456e7
commit d0d2fdd4b55fa96c6964e908dc6361ec471456e7
Author: Adam Strzelecki o...@java.pl
AuthorDate: Thu Jun 12 19:46:50 2014 +0200
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Fri Jun 27 16:58:05 2014 -0400
FindCUDA: Fix OSX Clang no C language enabled
When setting default CUDA_HOST_COMPILER we must dereference
CMAKE_C_COMPILER,
i.e. /usr/bin/clang should be used instead /usr/bin/cc which is symlink.
Otherwise CUDA thinks it is GCC and issues -dumpspecs which is unknown
option
to Clang.
Also in case neither CMAKE_C_COMPILER is defined (project does not use C
language) nor CUDA_HOST_COMPILER is specified manually we should skip -ccbin
and let nvcc use its own default C compiler.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index d9809ad..9e6e2a3 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -452,7 +452,14 @@ set(CUDA_NVCC_FLAGS CACHE STRING Semi-colon delimit
multiple arguments.)
if(CMAKE_GENERATOR MATCHES Visual Studio)
set(CUDA_HOST_COMPILER $(VCInstallDir)bin CACHE FILEPATH Host side
compiler used by NVCC)
else()
- set(CUDA_HOST_COMPILER ${CMAKE_C_COMPILER} CACHE FILEPATH Host side
compiler used by NVCC)
+ # Using cc which is symlink to clang may let NVCC think it is GCC and issue
+ # unhandled -dumpspecs option to clang.
+ if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
+get_filename_component(c_compiler_realpath ${CMAKE_C_COMPILER} REALPATH)
+ else()
+set(c_compiler_realpath )
+ endif()
+ set(CUDA_HOST_COMPILER ${c_compiler_realpath} CACHE FILEPATH Host side
compiler used by NVCC)
endif()
# Propagate the host flags to the host compiler via -Xcompiler
@@ -1422,7 +1429,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS
output_file cuda_target options
# If -ccbin, --compiler-bindir has been specified, don't do anything.
Otherwise add it here.
list( FIND nvcc_flags -ccbin ccbin_found0 )
list( FIND nvcc_flags --compiler-bindir ccbin_found1 )
-if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 )
+if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
list(APPEND nvcc_flags -ccbin \${CUDA_HOST_COMPILER}\)
endif()
# Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG}
diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake
index f0aac84..58e0d31 100644
--- a/Modules/FindCUDA/run_nvcc.cmake
+++ b/Modules/FindCUDA/run_nvcc.cmake
@@ -62,7 +62,7 @@ set(cmake_dependency_file @cmake_dependency_file@) # path
set(CUDA_make2cmake @CUDA_make2cmake@) # path
set(CUDA_parse_cubin @CUDA_parse_cubin@) # path
set(build_cubin @build_cubin@) # bool
-set(CUDA_HOST_COMPILER @CUDA_HOST_COMPILER@) # bool
+set(CUDA_HOST_COMPILER @CUDA_HOST_COMPILER@) # path
# We won't actually use these variables for now, but we need to set this, in
# order to force this file to be run again if it changes.
set(generated_file_path @generated_file_path@) # path
@@ -106,7 +106,7 @@ list(APPEND CUDA_NVCC_FLAGS
${CUDA_NVCC_FLAGS_${build_configuration}})
# Any -ccbin existing in CUDA_NVCC_FLAGS gets highest priority
list( FIND CUDA_NVCC_FLAGS -ccbin ccbin_found0 )
list( FIND CUDA_NVCC_FLAGS --compiler-bindir ccbin_found1 )
-if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 )
+if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
if (CUDA_HOST_COMPILER STREQUAL $(VCInstallDir)bin AND DEFINED CCBIN)
set(CCBIN -ccbin ${CCBIN})
else()
---
Summary of changes:
Modules/FindCUDA.cmake | 11 +--
Modules/FindCUDA/run_nvcc.cmake |4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3272-g359b1be
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 359b1be39a766605f4809aa5d197705a73bbb5da (commit)
via b67626acf13a7aa51fc6200ce11e807acc53b55f (commit)
via 0efccb2b963866506cf9a49b3a9c90c427bb01d4 (commit)
from 5ff359aa44572a4e99336c71ebe5ac53e337235a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=359b1be39a766605f4809aa5d197705a73bbb5da
commit 359b1be39a766605f4809aa5d197705a73bbb5da
Merge: 5ff359a b67626a
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed May 21 09:37:35 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 21 09:37:35 2014 -0400
Merge topic 'normalize_custom_command_paths' into next
b67626ac Unify all paths that custom command uses to be full paths.
0efccb2b Add a test to expose the custom command issue with paths.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b67626acf13a7aa51fc6200ce11e807acc53b55f
commit b67626acf13a7aa51fc6200ce11e807acc53b55f
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon May 19 17:13:23 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed May 21 09:18:17 2014 -0400
Unify all paths that custom command uses to be full paths.
diff --git a/Source/cmAddCustomCommandCommand.cxx
b/Source/cmAddCustomCommandCommand.cxx
index d5f00ff..623455f 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -162,6 +162,10 @@ bool cmAddCustomCommandCommand
}
filename += copy;
cmSystemTools::ConvertToUnixSlashes(filename);
+ if (cmSystemTools::FileIsFullPath(filename.c_str()))
+{
+filename = cmSystemTools::CollapseFullPath(filename.c_str());
+}
break;
case doing_source:
// We do not want to convert the argument to SOURCE because
@@ -197,6 +201,10 @@ bool cmAddCustomCommandCommand
// explicit dependency.
std::string dep = copy;
cmSystemTools::ConvertToUnixSlashes(dep);
+ if (cmSystemTools::FileIsFullPath(dep.c_str()))
+{
+dep = cmSystemTools::CollapseFullPath(dep.c_str());
+}
depends.push_back(dep);
// Add the implicit dependency language and file.
@@ -218,7 +226,11 @@ bool cmAddCustomCommandCommand
{
std::string dep = copy;
cmSystemTools::ConvertToUnixSlashes(dep);
- depends.push_back(dep);
+ if (cmSystemTools::FileIsFullPath(dep.c_str()))
+{
+dep = cmSystemTools::CollapseFullPath(dep.c_str());
+}
+ depends.push_back( dep );
}
break;
case doing_outputs:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0efccb2b963866506cf9a49b3a9c90c427bb01d4
commit 0efccb2b963866506cf9a49b3a9c90c427bb01d4
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed May 21 09:17:49 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed May 21 09:18:17 2014 -0400
Add a test to expose the custom command issue with paths.
diff --git a/Tests/CustomCommand/CMakeLists.txt
b/Tests/CustomCommand/CMakeLists.txt
index e0854ce..4f4fb26 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -135,10 +135,10 @@ add_dependencies(doc3Post TDocument)
#
-# Test using a multistep generated file
+# Test using a multistep generated file with collapsible path
#
-add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/foo.pre
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}//./foo.pre
DEPENDS ${PROJECT_SOURCE_DIR}/foo.in
TDocument # Ensure doc1.h generates before this target
COMMAND ${CMAKE_COMMAND}
---
Summary of changes:
Source/cmAddCustomCommandCommand.cxx | 14 +-
Tests/CustomCommand/CMakeLists.txt |4 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1787-gec4e2a1
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 ec4e2a1dd1f165f9e25335505cca54bacb2248b6 (commit)
via 01eaffdeb07dd3aa24667afd93185f0ee32c43fe (commit)
from 0db2409e341e88e62e3844c6d3ed3a730f6bf476 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec4e2a1dd1f165f9e25335505cca54bacb2248b6
commit ec4e2a1dd1f165f9e25335505cca54bacb2248b6
Merge: 0db2409 01eaffd
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Apr 3 11:39:17 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Apr 3 11:39:17 2014 -0400
Merge topic 'Qt4moc_perf' into next
01eaffde QT4_CREATE_MOC_COMMAND is now a function.
diff --cc Modules/Qt4Macros.cmake
index aca8996,5ada030..23c4fc0
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@@ -141,10 -141,10 +141,10 @@@ function (QT4_CREATE_MOC_COMMAND infil
set(_moc_extra_parameters_file @${_moc_parameters_file})
add_custom_command(OUTPUT ${outfile}
COMMAND Qt4::moc ${_moc_extra_parameters_file}
- DEPENDS ${infile}
+ DEPENDS ${infile} ${_moc_parameters_file}
${_moc_working_dir}
VERBATIM)
- endmacro ()
+ endfunction ()
macro (QT4_GENERATE_MOC infile outfile )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01eaffdeb07dd3aa24667afd93185f0ee32c43fe
commit 01eaffdeb07dd3aa24667afd93185f0ee32c43fe
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Apr 3 11:27:58 2014 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Thu Apr 3 11:27:58 2014 -0400
QT4_CREATE_MOC_COMMAND is now a function.
When we parse a large string ( moc_flags ) that has generator expressions
while inside a macro it has poor performance. This is due to the fact
that the because we are in a macro we have to evaluate the contents of the
string. By moving to a function we eliminate the need to evaluate the entire
contents of the string, and increase the performance.
In non scientific testing I have seen a 10x performance increase by moving
QT4_CREATE_MOC_COMMAND to being a function.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 8baf896..5ada030 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -103,7 +103,7 @@ endmacro()
# helper macro to set up a moc rule
-macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
+function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options
moc_target)
# For Windows, create a parameters file to work around command line length
limit
# Pass the parameters in a file. Set the working directory to
# be that containing the parameters file and reference it by
@@ -144,7 +144,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags
moc_options moc_target)
DEPENDS ${infile}
${_moc_working_dir}
VERBATIM)
-endmacro ()
+endfunction ()
macro (QT4_GENERATE_MOC infile outfile )
---
Summary of changes:
Modules/Qt4Macros.cmake |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6944-g4b5086e
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 4b5086ed91b080987f01318e9abe13f08dc0ceb7 (commit) via be239ea56c2d01bdd63897622ff4150f7740490a (commit) from 9334c82838dec7a40eea8facbbaee1cfdba30c1c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b5086ed91b080987f01318e9abe13f08dc0ceb7 commit 4b5086ed91b080987f01318e9abe13f08dc0ceb7 Merge: 9334c82 be239ea Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Fri Jan 10 09:38:13 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jan 10 09:38:13 2014 -0500 Merge topic 'ninja_fix_rerun' into next be239ea Insert CMakeCache.txt in implicitDeps before sorting. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be239ea56c2d01bdd63897622ff4150f7740490a commit be239ea56c2d01bdd63897622ff4150f7740490a Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Fri Jan 10 09:37:08 2014 -0500 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Fri Jan 10 09:37:08 2014 -0500 Insert CMakeCache.txt in implicitDeps before sorting. diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 7ff3ef4..3e4e506 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1100,11 +1100,15 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream os) temp.insert(temp.end(), of.begin(), of.end()); } + //Add the CMakeCache.txt file to the implicit depends so that we catch + //when somebody manually modifies the file. + implicitDeps.push_back(CMakeCache.txt); + //make sure nothing is in implicit depends twice std::sort(implicitDeps.begin(), implicitDeps.end()); implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()), implicitDeps.end()); - implicitDeps.push_back(CMakeCache.txt); + //make sure nothing is in outputs depends twice std::sort(temp.begin(), temp.end()); --- Summary of changes: Source/cmGlobalNinjaGenerator.cxx |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6930-g4b343f0
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 4b343f0c08060d81bc7fb7d20973d5383ae24409 (commit)
via ea9c30e39bff5b2316bc5f6bc607a4813da8001d (commit)
from 5233a3ddc6e6a79f1374c86839eb5c74fde4d2ca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b343f0c08060d81bc7fb7d20973d5383ae24409
commit 4b343f0c08060d81bc7fb7d20973d5383ae24409
Merge: 5233a3d ea9c30e
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Jan 9 16:56:51 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 16:56:51 2014 -0500
Merge topic 'ninja_fix_rerun' into next
ea9c30e Ninja generator was incorrectly marking dependencies as out of date.
diff --cc Source/cmGlobalNinjaGenerator.cxx
index ec91b0f,7ff3ef4..834ef9b
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@@ -1104,13 -1084,13 +1104,14 @@@ void cmGlobalNinjaGenerator::WriteTarge
Re-running CMake...,
Rule for re-running cmake.,
/*depfile=*/ ,
+/*deptype=*/ ,
/*rspfile=*/ ,
/*rspcontent*/ ,
- /*restat=*/ false,
+ /*restat=*/ true,
/*generator=*/ true);
- cmNinjaDeps implicitDeps;
+ cmNinjaDeps implicitDeps, outputs, temp;
+ outputs.push_back(NINJA_BUILD_FILE);
for (std::vectorcmLocalGenerator *::const_iterator i =
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea9c30e39bff5b2316bc5f6bc607a4813da8001d
commit ea9c30e39bff5b2316bc5f6bc607a4813da8001d
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Jan 9 13:18:18 2014 -0500
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Thu Jan 9 15:20:42 2014 -0500
Ninja generator was incorrectly marking dependencies as out of date.
Setting the generated as an implicit dependency of cmake caused errors when
we generated directories on machines as part of the build process. We can
fix
this by moving these to be order only dependencies.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 61d0272..7ff3ef4 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1086,27 +1086,42 @@ void
cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream os)
/*depfile=*/ ,
/*rspfile=*/ ,
/*rspcontent*/ ,
-/*restat=*/ false,
+/*restat=*/ true,
/*generator=*/ true);
- cmNinjaDeps implicitDeps;
+ cmNinjaDeps implicitDeps, outputs, temp;
+ outputs.push_back(NINJA_BUILD_FILE);
for (std::vectorcmLocalGenerator *::const_iterator i =
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
-implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
+temp.insert(temp.end(), of.begin(), of.end());
}
+
+ //make sure nothing is in implicit depends twice
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
implicitDeps.end());
implicitDeps.push_back(CMakeCache.txt);
+ //make sure nothing is in outputs depends twice
+ std::sort(temp.begin(), temp.end());
+ temp.erase(std::unique(temp.begin(), temp.end()),
+ temp.end());
+
+ //make sure that anything that is in implicitDeps is also NOT in outputs
+ std::set_difference(temp.begin(),
+ temp.end(),
+ implicitDeps.begin(),
+ implicitDeps.end(),
+ std::back_inserter(outputs));
+
this-WriteBuild(os,
Re-run CMake if any of its inputs changed.,
RERUN_CMAKE,
- /*outputs=*/ cmNinjaDeps(1, NINJA_BUILD_FILE),
+ outputs,
/*explicitDeps=*/ cmNinjaDeps(),
implicitDeps,
/*orderOnlyDeps=*/ cmNinjaDeps(),
---
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 23 +++
1 files changed, 19 insertions(+), 4 deletions(-)
hooks/post-receive
[Cmake-commits] CMake branch, release, updated. v2.8.11.2-833-g323f0b5
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 323f0b5acc9810e7cc304fe713468862ec2ebcb0 (commit) via 03c3fa68ea37af0dff590da724df8f548a9e34a9 (commit) via 1e11708a560f0d06867fb3f2a83149b224ef44ba (commit) via 38571f2c9446343a652cfdccea636028abd9f7aa (commit) via 92cc6539799b3236b184eea0506f8d22bf5c9035 (commit) via bbfa1b2bc5e42b9c78ad9710f34cd3d406c346f6 (commit) via 7d2adde2af756bc15139a92284ed96da5f758ce3 (commit) via 8ff2b5548c63aadea787b7e2a110100995c7ae56 (commit) via e5f6bf587d64518a79a33e8f6a141b6267849d3d (commit) via 0fcdef5e4d66bc5a6551459718bbb4903c954232 (commit) via dccc2b84a7d4abe0a0d3e064aa2a067ab341ecaf (commit) via 5ce44295c6a373c97364f7a3a2290d41b51e71dc (commit) via b91655585e14e680ce0bce1729c1281632d78504 (commit) via ce6c7366f77d019d4a04c0e55199b568098a5adb (commit) from ab9c7e36e598eb2fae3f3ee67c99c4afee7b8411 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=323f0b5acc9810e7cc304fe713468862ec2ebcb0 commit 323f0b5acc9810e7cc304fe713468862ec2ebcb0 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Sep 9 13:42:48 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Mon Sep 9 13:42:48 2013 -0400 CMake 2.8.12-rc3 diff --git a/ChangeLog.manual b/ChangeLog.manual index bc56e8f..1b22486 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,8 @@ +Changes in CMake 2.8.12-rc3 (since 2.8.12-rc2) +-- +Robert Maynard (1): + cmMakefile: Do not track CMake temporary files. + Changes in CMake 2.8.12-rc2 (since 2.8.12-rc1) -- Brad King (2): diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index fcffb29..eff11cf 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -3,4 +3,4 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) set(CMake_VERSION_TWEAK 0) -set(CMake_VERSION_RC 2) +set(CMake_VERSION_RC 3) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03c3fa68ea37af0dff590da724df8f548a9e34a9 commit 03c3fa68ea37af0dff590da724df8f548a9e34a9 Merge: 1e11708 ab9c7e3 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Sep 9 13:41:05 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Mon Sep 9 13:41:05 2013 -0400 Merge branch 'release' --- Summary of changes: ChangeLog.manual |5 + Source/CMakeVersion.cmake |2 +- Source/cmMakefile.cxx | 28 +++- 3 files changed, 25 insertions(+), 10 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4084-g6c91d8d
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 6c91d8df6106403fe6100edb738621deb184e854 (commit) via ce522800d98a308ee7a572dd4d4e1449217329e3 (commit) from 9769b53c0126a2f9f952c11066d8451b24ff6986 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c91d8df6106403fe6100edb738621deb184e854 commit 6c91d8df6106403fe6100edb738621deb184e854 Merge: 9769b53 ce52280 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Wed Sep 4 14:00:11 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 4 14:00:11 2013 -0400 Merge topic 'no_track_configured_files' into next ce52280 cmMakefile: Do not track CMake temporary files. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce522800d98a308ee7a572dd4d4e1449217329e3 commit ce522800d98a308ee7a572dd4d4e1449217329e3 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue Sep 3 15:31:12 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Wed Sep 4 13:58:11 2013 -0400 cmMakefile: Do not track CMake temporary files. We have to also track input files to the configure command. In theory the input to a configure command could it self be a file that is going to be deleted later ( output from a custom command or configure_file ). diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 93d665c..cada13a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -847,12 +847,22 @@ void cmMakefile::FinalPass() //remove_if will move all items that don't have a valid file name to the //back of the vector - std::vectorstd::string::iterator new_end = std::remove_if( -this-OutputFiles.begin(), -this-OutputFiles.end(), -file_not_persistent()); + std::vectorstd::string::iterator new_output_files_end = std::remove_if( + this-OutputFiles.begin(), + this-OutputFiles.end(), + file_not_persistent() ); //we just have to erase all items at the back - this-OutputFiles.erase(new_end, this-OutputFiles.end() ); + this-OutputFiles.erase(new_output_files_end, this-OutputFiles.end() ); + + //if a configured file is used as input for another configured file, + //and then deleted it will show up in the input list files so we + //need to scan those too + std::vectorstd::string::iterator new_list_files_end = std::remove_if( + this-ListFiles.begin(), + this-ListFiles.end(), + file_not_persistent() ); + + this-ListFiles.erase(new_list_files_end, this-ListFiles.end() ); } // Generate the output file --- Summary of changes: Source/cmMakefile.cxx | 20 +++- 1 files changed, 15 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4073-g3e44b0e
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 3e44b0e27c10b197788cd985db279465dd654be6 (commit)
via d3b46e797743fceb52dc6c9168f32363833560d5 (commit)
from 26a455840b3b40179314c50b0d04c31002cd34ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e44b0e27c10b197788cd985db279465dd654be6
commit 3e44b0e27c10b197788cd985db279465dd654be6
Merge: 26a4558 d3b46e7
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Sep 3 15:52:14 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 3 15:52:14 2013 -0400
Merge topic 'no_track_configured_files' into next
d3b46e7 cmMakefile: Do not track CMake temporary files.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3b46e797743fceb52dc6c9168f32363833560d5
commit d3b46e797743fceb52dc6c9168f32363833560d5
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Sep 3 15:31:12 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Sep 3 15:31:12 2013 -0400
cmMakefile: Do not track CMake temporary files.
Since commit ad502502 (cmMakefile: Track configured files so we can
regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the
configured file as an output file generated by CMake. The intention is
that for make and ninja we can re-run CMake when one of the files it
generates goes missing. However, files configured temporarily in
CMakeTmp directories by Check* modules do not live past the CMake
invocation.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2506209..6c73ebc 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -817,12 +817,13 @@ bool cmMakefile::NeedBackwardsCompatibility(unsigned int
major,
namespace
{
- struct file_exists
+ struct file_is_configured
{
bool operator()(const std::string path) const
-{
- return cmSystemTools::FileExists(path.c_str());
-}
+ {
+ return !((path.find(CMakeTmp) == path.npos)
+ cmSystemTools::FileExists(path.c_str()));
+ }
};
}
@@ -849,10 +850,9 @@ void cmMakefile::FinalPass()
std::vectorstd::string::iterator new_end = std::remove_if(
this-OutputFiles.begin(),
this-OutputFiles.end(),
-file_exists() );
+file_is_configured() );
//we just have to erase all items at the back
this-OutputFiles.erase(new_end, this-OutputFiles.end() );
-
}
// Generate the output file
---
Summary of changes:
Source/cmMakefile.cxx | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v2.8.11.2-819-gab9c7e3
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 ab9c7e36e598eb2fae3f3ee67c99c4afee7b8411 (commit) via 90b51230d93eef07e16000c6bdfe2eb0cef65a82 (commit) via 452882ebeb032b25a08d35f2b2df3a785093ca6c (commit) via b62042dbfb422563dc9a240bd89efc28de8e4b17 (commit) via b6fe422a4c0e48d6ae10a5a44892bdac5146acdb (commit) via 549b95f115d1f98a68ed390816d5ac9e1eb38806 (commit) via 782eba3a0c74009e24708d28fd520b1ba919d326 (commit) via ddff7ae0ceb4b77448c8780b8e45f4012131572c (commit) via 5e15f398860712930387b78e36a7ae5ab8a9b775 (commit) via 4e7a4a0453f1bd7264d414e6f5b62ff61b0d2396 (commit) via 0264eec9d32200c692ddfb756871ac4a4465863c (commit) via b6f6802b3d0dc1a9ab7beb62a17bd0651d87a64f (commit) via 3580b9f338398c74575be56e98299361cd985a09 (commit) via 150bc7da3dba160acab5cb11387c9a29255973ac (commit) via 15d98a42fd2b7cadfdbc9268da3c79f389c5a3cc (commit) via b15ad0d1de7524be3b32d6691b68d3578ee00ca5 (commit) via 23b88ecd8580670d6ecefade583ed2db39a74f74 (commit) via fd09fd78a902086410852229f7609edbe3874d9f (commit) via 9b2940875e51457c77dd946b18b1314a6904454d (commit) via ae4630fb1dd2f5d51f9fbea7007336af07eb83c9 (commit) via df62f64db72b6f00657e9e739e1e117639dea9da (commit) via c5baca780472a6e2ec1615bed2619be98482b992 (commit) via cc8f79670e6c6533a76b80656c87342c0c1696a4 (commit) via fd4fb9ef040dde7961500e2241b43909a9e6b1a4 (commit) via 889527aa9cd9f2b69d429ed766926105242fb0a8 (commit) via 4d5d8df0cdd1d413853a0e8b64b20a8e63c05230 (commit) via 757de2bb784789caab5e0a5498b1321814c16a65 (commit) via 4923c6c724ffa64043d1bac5ec148e8d01f5d02a (commit) via 32ea090a70a2d5cc8fbcfe2511492f74e97f7dff (commit) via 3064f80d254fae7ce395bbd744133a53b11170f9 (commit) via 141ce010621319f9b5e54d41b3b34cd05da63374 (commit) via 464456646fbb4e7500ef4b982a3ed9317493f565 (commit) via beffeb1ffe474870c09630dcd7a801d2a27b86b3 (commit) via eef6df5c7d97680f9c20729555c061cf3e2b2482 (commit) via 898d920d54ed2f0520f97b8221575769b25da2f1 (commit) via b864a5396a1abd22f995c3b376ff2021a8cd4d4e (commit) via 374af6529a08fc1c9c9c16e5d55929c450db6e35 (commit) via 78cd8842966efb6d54668d47ee92bdeed35cc79e (commit) via 7324eb896eb7337aaec2baf44d11d419a9d87b30 (commit) via d7c9d60d9fa552a22944d9a912dd61539e012102 (commit) via 56cf74e73446f61b9ac84837931ea79c8e90d42c (commit) via 79af005cf8d58575315916c24d8cd518065ab3c2 (commit) via 10ad7e458c5eaffb090068a62cf6c4d1eb2df6a6 (commit) via 2dce48ff80dd77bd788952b10a481aa90dfad20e (commit) via 31719643c5ae54c063a50938a467f3cfc8e0d7df (commit) via 807a564e7a123f139770406d2c4a02d062be28c6 (commit) via 293ecfeb79f9c0ac3e9018fa66d7cc944b9a21d9 (commit) via 5803b94a8b11b89d81f5492891430e2d55723346 (commit) from 330db97e64e9e370ecf636aae2275044286537bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab9c7e36e598eb2fae3f3ee67c99c4afee7b8411 commit ab9c7e36e598eb2fae3f3ee67c99c4afee7b8411 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Fri Aug 30 09:28:27 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Fri Aug 30 11:52:13 2013 -0400 CMake 2.8.12-rc2 diff --git a/ChangeLog.manual b/ChangeLog.manual index d8f33e2..bc56e8f 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,39 @@ +Changes in CMake 2.8.12-rc2 (since 2.8.12-rc1) +-- +Brad King (2): + Fix RunCMake.Configure test expectation newline matching + Clean up install rules of CMake itself (#14371) + +Clinton Stimpson (1): + OSX: Allow an empty INSTALL_NAME_DIR to override MACOSX_RPATH. + +Eric Bélanger (1): + FindImageMagick: Find libraries named with HDRI support (#14348) + +Raphael Kubo da Costa (1): + FindTCL: Add BSD paths for Tcl/Tk 8.6 + +Robert Maynard (2): + VS: Generate ToolsVersion matching each VS version + cmMakefile: Do not track configured files known to be temporary + +Rolf Eike Beer (1): + CheckC*CompilerFlag: add documentation what to expect from a positive result + +Stephen Kelly (6): + Fix OLD behavior of CMP0021. + try_compile: Extract IMPORTED targets from LINK_DEPENDENT_LIBRARIES + try_compile: Extract IMPORTED targets from INTERFACE_LINK_LIBRARIES + Genex: Fix evaluation of MAP_IMPORTED_CONFIG_CONFIG
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4037-gc360c69
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 c360c6952b11a91d5dd553bb7ac5bcb8559fb12b (commit)
via 0264eec9d32200c692ddfb756871ac4a4465863c (commit)
from ebac5ffd9cb72f6d6cc0a00899c5ea67021f95e8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c360c6952b11a91d5dd553bb7ac5bcb8559fb12b
commit c360c6952b11a91d5dd553bb7ac5bcb8559fb12b
Merge: ebac5ff 0264eec
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Aug 28 14:35:53 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 28 14:35:53 2013 -0400
Merge topic 'no_track_configured_files' into next
0264eec cmMakefile: Do not track configured files known to be temporary
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0264eec9d32200c692ddfb756871ac4a4465863c
commit 0264eec9d32200c692ddfb756871ac4a4465863c
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Aug 28 12:49:53 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Aug 28 12:49:53 2013 -0400
cmMakefile: Do not track configured files known to be temporary
Since commit ad502502 (cmMakefile: Track configured files so we can
regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the
configured file as an output file generated by CMake. The intention is
that for make and ninja we can re-run CMake when one of the files it
generates goes missing. However, files configured temporarily in
CMakeTmp directories by Check* modules do not live past the CMake
invocation.
Teach cmMakefile::FinalPass to stop tracking files that don't
exist after we are finished generation.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1f5c911..2506209 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -814,6 +814,18 @@ bool cmMakefile::NeedBackwardsCompatibility(unsigned int
major,
}
}
+
+namespace
+{
+ struct file_exists
+ {
+bool operator()(const std::string path) const
+{
+ return cmSystemTools::FileExists(path.c_str());
+}
+ };
+}
+
void cmMakefile::FinalPass()
{
// do all the variable expansions here
@@ -827,6 +839,20 @@ void cmMakefile::FinalPass()
(*i)-FinalPass();
}
+ //go through all configured files and see which ones still exist.
+ //we don't want cmake to re-run if a configured file is created and deleted
+ //during processing as that would make it a transient file that can't
+ //influence the build process
+
+ //remove_if will move all items that don't have a valid file name to the
+ //back of the vector
+ std::vectorstd::string::iterator new_end = std::remove_if(
+this-OutputFiles.begin(),
+this-OutputFiles.end(),
+file_exists() );
+ //we just have to erase all items at the back
+ this-OutputFiles.erase(new_end, this-OutputFiles.end() );
+
}
// Generate the output file
@@ -3371,11 +3397,12 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
std::string sinfile = infile;
this-AddCMakeDependFile(sinfile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
+
// Re-generate if non-temporary outputs are missing.
- if(soutfile.find(CMakeTmp) == soutfile.npos)
-{
-this-AddCMakeOutputFile(soutfile);
-}
+ //when we finalize the configuration we will remove all
+ //output files that now don't exist.
+ this-AddCMakeOutputFile(soutfile);
+
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
std::string::size_type pos = soutfile.rfind('/');
---
Summary of changes:
Source/cmMakefile.cxx | 35 +++
1 files changed, 31 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3951-g3f6bdd3
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 3f6bdd32d1c42de8ce4254b7c9ec1fd07c3d6f6a (commit) via 1a0f111233941db135ec606f0c358d74347b80d5 (commit) from 396a4b41d2adb1009cd1f26c332f50de76b24689 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f6bdd32d1c42de8ce4254b7c9ec1fd07c3d6f6a commit 3f6bdd32d1c42de8ce4254b7c9ec1fd07c3d6f6a Merge: 396a4b4 1a0f111 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Wed Aug 21 09:23:25 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 21 09:23:25 2013 -0400 Merge topic 'vs2013_toolset_14369' into next 1a0f111 KWStyle: Correct lines that are too long. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a0f111233941db135ec606f0c358d74347b80d5 commit 1a0f111233941db135ec606f0c358d74347b80d5 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Wed Aug 21 09:22:45 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Wed Aug 21 09:22:45 2013 -0400 KWStyle: Correct lines that are too long. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index effe966..ac888c4 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -219,10 +219,11 @@ void cmVisualStudio10TargetGenerator::Generate() //get the tools version to use const std::string toolsVer(this-GlobalGenerator-GetToolsVersion()); - std::string project_defaults = ?xml version=\1.0\ encoding=\utf-8\?\n; + std::string project_defaults=?xml version=\1.0\ encoding=\utf-8\?\n; project_defaults.append(Project DefaultTargets=\Build\ ToolsVersion=\); project_defaults.append(toolsVer + \ ); - project_defaults.append(xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); + project_defaults.append( + xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); this-WriteString(project_defaults.c_str(),0); this-WriteProjectConfigurations(); @@ -722,10 +723,11 @@ void cmVisualStudio10TargetGenerator::WriteGroups() //get the tools version to use const std::string toolsVer(this-GlobalGenerator-GetToolsVersion()); - std::string project_defaults = ?xml version=\1.0\ encoding=\utf-8\?\n; + std::string project_defaults=?xml version=\1.0\ encoding=\utf-8\?\n; project_defaults.append(Project ToolsVersion=\); project_defaults.append(toolsVer + \ ); - project_defaults.append(xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); + project_defaults.append( +xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); this-WriteString(project_defaults.c_str(),0); for(ToolSourceMap::const_iterator ti = this-Tools.begin(); --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 10 ++ 1 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3953-gda83b29
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 da83b29d97e604e70733b9a26de1929c9a0e8d7e (commit) via e6730f0a94c3d4f0c1f2fceee1af9f2fae7355ac (commit) from 3f6bdd32d1c42de8ce4254b7c9ec1fd07c3d6f6a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da83b29d97e604e70733b9a26de1929c9a0e8d7e commit da83b29d97e604e70733b9a26de1929c9a0e8d7e Merge: 3f6bdd3 e6730f0 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Wed Aug 21 10:37:44 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 21 10:37:44 2013 -0400 Merge topic 'vs2013_toolset_14369' into next e6730f0 VS: Correct trailing space inside toolset name. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6730f0a94c3d4f0c1f2fceee1af9f2fae7355ac commit e6730f0a94c3d4f0c1f2fceee1af9f2fae7355ac Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Wed Aug 21 10:37:11 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Wed Aug 21 10:37:11 2013 -0400 VS: Correct trailing space inside toolset name. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index ac888c4..a26b291 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -221,7 +221,7 @@ void cmVisualStudio10TargetGenerator::Generate() const std::string toolsVer(this-GlobalGenerator-GetToolsVersion()); std::string project_defaults=?xml version=\1.0\ encoding=\utf-8\?\n; project_defaults.append(Project DefaultTargets=\Build\ ToolsVersion=\); - project_defaults.append(toolsVer + \ ); + project_defaults.append(toolsVer +\ ); project_defaults.append( xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); this-WriteString(project_defaults.c_str(),0); @@ -725,7 +725,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups() const std::string toolsVer(this-GlobalGenerator-GetToolsVersion()); std::string project_defaults=?xml version=\1.0\ encoding=\utf-8\?\n; project_defaults.append(Project ToolsVersion=\); - project_defaults.append(toolsVer + \ ); + project_defaults.append(toolsVer +\ ); project_defaults.append( xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); this-WriteString(project_defaults.c_str(),0); --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3937-g6050e2d
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 6050e2d50dc11ac8a9528ae04b27b486b27d7794 (commit)
via 066e47983dc9e162358d5876c4a74f3a2fd7adb2 (commit)
from 5641e9c86eaa41d0c21c05f88631470a62f95048 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6050e2d50dc11ac8a9528ae04b27b486b27d7794
commit 6050e2d50dc11ac8a9528ae04b27b486b27d7794
Merge: 5641e9c 066e479
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 15:43:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 20 15:43:25 2013 -0400
Merge topic 'vs2013_toolset_14369' into next
066e479 VS: Each Visual Studio Generator has a tools version.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=066e47983dc9e162358d5876c4a74f3a2fd7adb2
commit 066e47983dc9e162358d5876c4a74f3a2fd7adb2
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 14:59:59 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Aug 20 15:06:18 2013 -0400
VS: Each Visual Studio Generator has a tools version.
The MSBuild version for each visual studio generator isn't 4.0. With Visual
Studo 2013 the ToolsVersion moved from being tied to the .Net Generator and
now
has its own version number.
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 0a95091..f58524b 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -83,6 +83,7 @@ public:
std::string const sfRel);
protected:
virtual const char* GetIDEVersion() { return 10.0; }
+ virtual const char* GetToolsVersion() { return 4.0; }
std::string PlatformToolset;
bool ExpressEdition;
diff --git a/Source/cmGlobalVisualStudio12Generator.h
b/Source/cmGlobalVisualStudio12Generator.h
index 064e310..c78c63c 100644
--- a/Source/cmGlobalVisualStudio12Generator.h
+++ b/Source/cmGlobalVisualStudio12Generator.h
@@ -33,6 +33,10 @@ public:
virtual std::string GetUserMacrosDirectory() { return ; }
protected:
virtual const char* GetIDEVersion() { return 12.0; }
+ //in Visual Studio 2013 they detached the MSBuild tools version
+ //from the .Net Framework version and instead made it have it's own
+ //version number
+ virtual const char* GetToolsVersion() { return 12.0; }
private:
class Factory;
};
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index ea05347..532f417 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -216,12 +216,16 @@ void cmVisualStudio10TargetGenerator::Generate()
// Write the encoding header into the file
char magic[] = {0xEF,0xBB, 0xBF};
this-BuildFileStream-write(magic, 3);
- this-WriteString(?xml version=\1.0\ encoding=\utf-8\?\n,0);
- this-WriteString(Project DefaultTargets=\Build\
-ToolsVersion=\4.0\
-xmlns=\http://schemas.microsoft.com/;
-developer/msbuild/2003\\n,
-0);
+
+ //get the tools version to use
+ const std::string toolsVer(this-GlobalGenerator-GetToolsVersion());
+ const std::string project_defaults =
+?xml version=\1.0\ encoding=\utf-8\?\n +
+Project DefaultTargets=\Build\ ToolsVersion=\ + toolsVer + \ +
+xmlns=\http://schemas.microsoft.com/; +
+developer/msbuild/2003\\n;
+ this-WriteString(project_defaults.c_str(),0);
+
this-WriteProjectConfigurations();
this-WriteString(PropertyGroup Label=\Globals\\n, 1);
this-WriteString(ProjectGUID, 2);
@@ -716,12 +720,16 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
fout.write(magic, 3);
cmGeneratedFileStream* save = this-BuildFileStream;
this-BuildFileStream = fout;
- this-WriteString(?xml version=\1.0\ encoding=\utf-8\?\n
-Project
-ToolsVersion=\4.0\
-xmlns=\http://schemas.microsoft.com/;
-developer/msbuild/2003\\n,
-0);
+
+ //get the tools version to use
+ const std::string toolsVer(this-GlobalGenerator-GetToolsVersion());
+ const std::string project_defaults =
+?xml version=\1.0\ encoding=\utf-8\?\n +
+Project ToolsVersion=\ + toolsVer + \ +
+xmlns=\http://schemas.microsoft.com/; +
+developer/msbuild/2003\\n;
+ this-WriteString(project_defaults.c_str(),0);
+
for(ToolSourceMap::const_iterator ti = this-Tools.begin();
ti != this-Tools.end(); ++ti
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3939-gf783bb1
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 f783bb19d369eb6e35bd1f11a93a86946ebea1d6 (commit)
via aeebe90eb6f7e9d67825c3001e670c3ac5f54596 (commit)
from 6050e2d50dc11ac8a9528ae04b27b486b27d7794 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f783bb19d369eb6e35bd1f11a93a86946ebea1d6
commit f783bb19d369eb6e35bd1f11a93a86946ebea1d6
Merge: 6050e2d aeebe90
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 15:54:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 20 15:54:31 2013 -0400
Merge topic 'vs2013_toolset_14369' into next
aeebe90 VS: Update so the method is public.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeebe90eb6f7e9d67825c3001e670c3ac5f54596
commit aeebe90eb6f7e9d67825c3001e670c3ac5f54596
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 15:53:58 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Aug 20 15:53:58 2013 -0400
VS: Update so the method is public.
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index f58524b..31e122e 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -81,9 +81,11 @@ public:
void PathTooLong(cmTarget* target, cmSourceFile* sf,
std::string const sfRel);
+
+ virtual const char* GetToolsVersion() { return 4.0; }
+
protected:
virtual const char* GetIDEVersion() { return 10.0; }
- virtual const char* GetToolsVersion() { return 4.0; }
std::string PlatformToolset;
bool ExpressEdition;
diff --git a/Source/cmGlobalVisualStudio12Generator.h
b/Source/cmGlobalVisualStudio12Generator.h
index c78c63c..8c8aeb1 100644
--- a/Source/cmGlobalVisualStudio12Generator.h
+++ b/Source/cmGlobalVisualStudio12Generator.h
@@ -31,12 +31,13 @@ public:
/** TODO: VS 12 user macro support. */
virtual std::string GetUserMacrosDirectory() { return ; }
-protected:
- virtual const char* GetIDEVersion() { return 12.0; }
+
//in Visual Studio 2013 they detached the MSBuild tools version
//from the .Net Framework version and instead made it have it's own
//version number
virtual const char* GetToolsVersion() { return 12.0; }
+protected:
+ virtual const char* GetIDEVersion() { return 12.0; }
private:
class Factory;
};
---
Summary of changes:
Source/cmGlobalVisualStudio10Generator.h |4 +++-
Source/cmGlobalVisualStudio12Generator.h |5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3941-gbe3cda3
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 be3cda3d00d617fa08599291b5c5b8138824bf5a (commit)
via 7804a13df30b3adc48eb03169bbdd18481705974 (commit)
from f783bb19d369eb6e35bd1f11a93a86946ebea1d6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be3cda3d00d617fa08599291b5c5b8138824bf5a
commit be3cda3d00d617fa08599291b5c5b8138824bf5a
Merge: f783bb1 7804a13
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 15:55:21 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 20 15:55:21 2013 -0400
Merge topic 'vs2013_toolset_14369' into next
7804a13 VS: Each Visual Studio Generator has a tools version.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7804a13df30b3adc48eb03169bbdd18481705974
commit 7804a13df30b3adc48eb03169bbdd18481705974
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 14:59:59 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Aug 20 15:55:00 2013 -0400
VS: Each Visual Studio Generator has a tools version.
The MSBuild version for each visual studio generator isn't 4.0. With Visual
Studo 2013 the ToolsVersion moved from being tied to the .Net Generator and
now
has its own version number.
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 0a95091..31e122e 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -81,6 +81,9 @@ public:
void PathTooLong(cmTarget* target, cmSourceFile* sf,
std::string const sfRel);
+
+ virtual const char* GetToolsVersion() { return 4.0; }
+
protected:
virtual const char* GetIDEVersion() { return 10.0; }
diff --git a/Source/cmGlobalVisualStudio12Generator.h
b/Source/cmGlobalVisualStudio12Generator.h
index 064e310..8c8aeb1 100644
--- a/Source/cmGlobalVisualStudio12Generator.h
+++ b/Source/cmGlobalVisualStudio12Generator.h
@@ -31,6 +31,11 @@ public:
/** TODO: VS 12 user macro support. */
virtual std::string GetUserMacrosDirectory() { return ; }
+
+ //in Visual Studio 2013 they detached the MSBuild tools version
+ //from the .Net Framework version and instead made it have it's own
+ //version number
+ virtual const char* GetToolsVersion() { return 12.0; }
protected:
virtual const char* GetIDEVersion() { return 12.0; }
private:
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index ea05347..532f417 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -216,12 +216,16 @@ void cmVisualStudio10TargetGenerator::Generate()
// Write the encoding header into the file
char magic[] = {0xEF,0xBB, 0xBF};
this-BuildFileStream-write(magic, 3);
- this-WriteString(?xml version=\1.0\ encoding=\utf-8\?\n,0);
- this-WriteString(Project DefaultTargets=\Build\
-ToolsVersion=\4.0\
-xmlns=\http://schemas.microsoft.com/;
-developer/msbuild/2003\\n,
-0);
+
+ //get the tools version to use
+ const std::string toolsVer(this-GlobalGenerator-GetToolsVersion());
+ const std::string project_defaults =
+?xml version=\1.0\ encoding=\utf-8\?\n +
+Project DefaultTargets=\Build\ ToolsVersion=\ + toolsVer + \ +
+xmlns=\http://schemas.microsoft.com/; +
+developer/msbuild/2003\\n;
+ this-WriteString(project_defaults.c_str(),0);
+
this-WriteProjectConfigurations();
this-WriteString(PropertyGroup Label=\Globals\\n, 1);
this-WriteString(ProjectGUID, 2);
@@ -716,12 +720,16 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
fout.write(magic, 3);
cmGeneratedFileStream* save = this-BuildFileStream;
this-BuildFileStream = fout;
- this-WriteString(?xml version=\1.0\ encoding=\utf-8\?\n
-Project
-ToolsVersion=\4.0\
-xmlns=\http://schemas.microsoft.com/;
-developer/msbuild/2003\\n,
-0);
+
+ //get the tools version to use
+ const std::string toolsVer(this-GlobalGenerator-GetToolsVersion());
+ const std::string project_defaults =
+?xml version=\1.0\ encoding=\utf-8\?\n +
+Project ToolsVersion=\ + toolsVer + \ +
+xmlns=\http://schemas.microsoft.com/; +
+developer/msbuild/2003\\n;
+ this-WriteString(project_defaults.c_str(),0);
+
for(ToolSourceMap::const_iterator ti = this-Tools.begin();
ti != this-Tools.end(); ++ti
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3943-g90257b8
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 90257b817393fec01b03a239904d107cd004543d (commit) via e10ceec8a0b2870af2a01160c2438e382f7c7251 (commit) from be3cda3d00d617fa08599291b5c5b8138824bf5a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90257b817393fec01b03a239904d107cd004543d commit 90257b817393fec01b03a239904d107cd004543d Merge: be3cda3 e10ceec Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue Aug 20 16:25:42 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 20 16:25:42 2013 -0400 Merge topic 'vs2013_toolset_14369' into next e10ceec VS: Corrected usaged of std::string append. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e10ceec8a0b2870af2a01160c2438e382f7c7251 commit e10ceec8a0b2870af2a01160c2438e382f7c7251 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue Aug 20 16:20:19 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Tue Aug 20 16:20:19 2013 -0400 VS: Corrected usaged of std::string append. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 532f417..effe966 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -219,11 +219,10 @@ void cmVisualStudio10TargetGenerator::Generate() //get the tools version to use const std::string toolsVer(this-GlobalGenerator-GetToolsVersion()); - const std::string project_defaults = -?xml version=\1.0\ encoding=\utf-8\?\n + -Project DefaultTargets=\Build\ ToolsVersion=\ + toolsVer + \ + -xmlns=\http://schemas.microsoft.com/; + -developer/msbuild/2003\\n; + std::string project_defaults = ?xml version=\1.0\ encoding=\utf-8\?\n; + project_defaults.append(Project DefaultTargets=\Build\ ToolsVersion=\); + project_defaults.append(toolsVer + \ ); + project_defaults.append(xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); this-WriteString(project_defaults.c_str(),0); this-WriteProjectConfigurations(); @@ -723,11 +722,10 @@ void cmVisualStudio10TargetGenerator::WriteGroups() //get the tools version to use const std::string toolsVer(this-GlobalGenerator-GetToolsVersion()); - const std::string project_defaults = -?xml version=\1.0\ encoding=\utf-8\?\n + -Project ToolsVersion=\ + toolsVer + \ + -xmlns=\http://schemas.microsoft.com/; + -developer/msbuild/2003\\n; + std::string project_defaults = ?xml version=\1.0\ encoding=\utf-8\?\n; + project_defaults.append(Project ToolsVersion=\); + project_defaults.append(toolsVer + \ ); + project_defaults.append(xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n); this-WriteString(project_defaults.c_str(),0); for(ToolSourceMap::const_iterator ti = this-Tools.begin(); --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 18 -- 1 files changed, 8 insertions(+), 10 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3945-g9367bd4
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 9367bd4dd10fcc191f68bd21c99c355661937c9f (commit)
via f0cf64ccbbe4c3c34fc93dea06f85cf8dcd77fb9 (commit)
from 90257b817393fec01b03a239904d107cd004543d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9367bd4dd10fcc191f68bd21c99c355661937c9f
commit 9367bd4dd10fcc191f68bd21c99c355661937c9f
Merge: 90257b8 f0cf64c
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 16:26:27 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 20 16:26:27 2013 -0400
Merge topic 'vs2013_toolset_14369' into next
f0cf64c VS: Each Visual Studio Generator has a tools version.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0cf64ccbbe4c3c34fc93dea06f85cf8dcd77fb9
commit f0cf64ccbbe4c3c34fc93dea06f85cf8dcd77fb9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Aug 20 14:59:59 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Aug 20 16:26:05 2013 -0400
VS: Each Visual Studio Generator has a tools version.
The MSBuild version for each visual studio generator isn't 4.0. With Visual
Studo 2013 the ToolsVersion moved from being tied to the .Net Generator and
now
has its own version number.
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 0a95091..31e122e 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -81,6 +81,9 @@ public:
void PathTooLong(cmTarget* target, cmSourceFile* sf,
std::string const sfRel);
+
+ virtual const char* GetToolsVersion() { return 4.0; }
+
protected:
virtual const char* GetIDEVersion() { return 10.0; }
diff --git a/Source/cmGlobalVisualStudio12Generator.h
b/Source/cmGlobalVisualStudio12Generator.h
index 064e310..8c8aeb1 100644
--- a/Source/cmGlobalVisualStudio12Generator.h
+++ b/Source/cmGlobalVisualStudio12Generator.h
@@ -31,6 +31,11 @@ public:
/** TODO: VS 12 user macro support. */
virtual std::string GetUserMacrosDirectory() { return ; }
+
+ //in Visual Studio 2013 they detached the MSBuild tools version
+ //from the .Net Framework version and instead made it have it's own
+ //version number
+ virtual const char* GetToolsVersion() { return 12.0; }
protected:
virtual const char* GetIDEVersion() { return 12.0; }
private:
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index ea05347..effe966 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -216,12 +216,15 @@ void cmVisualStudio10TargetGenerator::Generate()
// Write the encoding header into the file
char magic[] = {0xEF,0xBB, 0xBF};
this-BuildFileStream-write(magic, 3);
- this-WriteString(?xml version=\1.0\ encoding=\utf-8\?\n,0);
- this-WriteString(Project DefaultTargets=\Build\
-ToolsVersion=\4.0\
-xmlns=\http://schemas.microsoft.com/;
-developer/msbuild/2003\\n,
-0);
+
+ //get the tools version to use
+ const std::string toolsVer(this-GlobalGenerator-GetToolsVersion());
+ std::string project_defaults = ?xml version=\1.0\
encoding=\utf-8\?\n;
+ project_defaults.append(Project DefaultTargets=\Build\ ToolsVersion=\);
+ project_defaults.append(toolsVer + \ );
+
project_defaults.append(xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n);
+ this-WriteString(project_defaults.c_str(),0);
+
this-WriteProjectConfigurations();
this-WriteString(PropertyGroup Label=\Globals\\n, 1);
this-WriteString(ProjectGUID, 2);
@@ -716,12 +719,15 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
fout.write(magic, 3);
cmGeneratedFileStream* save = this-BuildFileStream;
this-BuildFileStream = fout;
- this-WriteString(?xml version=\1.0\ encoding=\utf-8\?\n
-Project
-ToolsVersion=\4.0\
-xmlns=\http://schemas.microsoft.com/;
-developer/msbuild/2003\\n,
-0);
+
+ //get the tools version to use
+ const std::string toolsVer(this-GlobalGenerator-GetToolsVersion());
+ std::string project_defaults = ?xml version=\1.0\
encoding=\utf-8\?\n;
+ project_defaults.append(Project ToolsVersion=\);
+ project_defaults.append(toolsVer + \ );
+
project_defaults.append(xmlns=\http://schemas.microsoft.com/developer/msbuild/2003\;\n);
+ this-WriteString(project_defaults.c_str(),0);
+
for(ToolSourceMap
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3308-g096f934
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 096f93491eef96d0bbb25dfd7541aa19aff2118e (commit)
via 3ac978fa0f5324c220f4b6d7bbedfddbc3c4ae34 (commit)
from e98b6a559beaba092c2f42a127b723c29927b3d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=096f93491eef96d0bbb25dfd7541aa19aff2118e
commit 096f93491eef96d0bbb25dfd7541aa19aff2118e
Merge: e98b6a5 3ac978f
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Jul 24 09:30:55 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 24 09:30:55 2013 -0400
Merge topic 'ninja_bad_cmcldeps_paths' into next
3ac978f BuildDepends: Correct the generation of header.txt.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac978fa0f5324c220f4b6d7bbedfddbc3c4ae34
commit 3ac978fa0f5324c220f4b6d7bbedfddbc3c4ae34
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Jul 24 09:20:50 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Jul 24 09:20:50 2013 -0400
BuildDepends: Correct the generation of header.txt.
Now you can run the test multiple times without having bad state
propagated from the first run, causing all futures runs to fail.
diff --git a/Tests/BuildDepends/CMakeLists.txt
b/Tests/BuildDepends/CMakeLists.txt
index ce0c039..6281c40 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -53,6 +53,8 @@ write_file(${BuildDepends_BINARY_DIR}/Project/foo.cxx
file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot.hxx.in
static const char* zot = \zot\;\n)
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/dir/header.txt
+ #define HEADER_STRING \ninja\\n )
file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_custom.hxx.in
static const char* zot_custom = \zot_custom\;\n)
file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_macro_dir.hxx
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt
b/Tests/BuildDepends/Project/CMakeLists.txt
index cb4faee..b4c6a07 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -124,15 +124,6 @@ add_custom_target(link_depends_no_shared_check ALL
)
add_dependencies(link_depends_no_shared_check link_depends_no_shared_exe)
-# add a test for ninja dep handler
-add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
- ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
- )
-
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
diff --git a/Tests/BuildDepends/Project/dir/header.txt
b/Tests/BuildDepends/Project/dir/header.txt
deleted file mode 100644
index f2355dc..000
--- a/Tests/BuildDepends/Project/dir/header.txt
+++ /dev/null
@@ -1 +0,0 @@
-#define HEADER_STRING ninja
\ No newline at end of file
---
Summary of changes:
Tests/BuildDepends/CMakeLists.txt |2 ++
Tests/BuildDepends/Project/CMakeLists.txt |9 -
Tests/BuildDepends/Project/dir/header.txt |1 -
3 files changed, 2 insertions(+), 10 deletions(-)
delete mode 100644 Tests/BuildDepends/Project/dir/header.txt
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3302-gadfb168
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 adfb1689bf88067c94b72494fb44f81d2020732c (commit)
via 11391b75693a5006966217b785b76ff0249709ad (commit)
via ffe79b582ffeb05b5db3a5fd6b4450f848f9ffe6 (commit)
from e371468d0e0890ab810acb1ddfd176424974a09e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adfb1689bf88067c94b72494fb44f81d2020732c
commit adfb1689bf88067c94b72494fb44f81d2020732c
Merge: e371468 11391b7
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jul 23 10:30:56 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 23 10:30:56 2013 -0400
Merge topic 'ninja_bad_cmcldeps_paths' into next
11391b7 Ninja: Make cmcldeps depfile output more consistent with 'ninja -t
msvc'
ffe79b5 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11391b75693a5006966217b785b76ff0249709ad
commit 11391b75693a5006966217b785b76ff0249709ad
Author: Reid Kleckner r...@google.com
AuthorDate: Thu May 23 15:13:55 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jul 23 09:58:12 2013 -0400
Ninja: Make cmcldeps depfile output more consistent with 'ninja -t msvc'
Ninja relies on the generator to produce paths that match up with the
paths used in the build.ninja file, which are spelled with backslashes.
Therefore, cmcldeps should canonicalize depfile paths to use backslashes
and relativize paths to the build directory.
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 262d83b..a0ef6e6 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -62,8 +62,8 @@ static std::string trimLeadingSpace(const std::string
cmdline) {
return cmdline.substr(i);
}
-static void doEscape(std::string str, const std::string search,
- const std::string repl) {
+static void replaceAll(std::string str, const std::string search,
+ const std::string repl) {
std::string::size_type pos = 0;
while ((pos = str.find(search, pos)) != std::string::npos) {
str.replace(pos, search.size(), repl);
@@ -71,6 +71,10 @@ static void doEscape(std::string str, const std::string
search,
}
}
+bool startsWith(const std::string str, const std::string what) {
+ return str.compare(0, what.size(), what) == 0;
+}
+
// Strips one argument from the cmdline and returns it. surrounding quotes
// are removed from the argument if there were any.
static std::string getArg(std::string cmdline) {
@@ -117,6 +121,13 @@ static void parseCommandLine(LPTSTR wincmdline,
rest = trimLeadingSpace(cmdline);
}
+// Not all backslashes need to be escaped in a depfile, but it's easier that
+// way. See the re2c grammar in ninja's source code for more info.
+static void escapePath(std::string path) {
+ replaceAll(path, \\, );
+ replaceAll(path, , \\ );
+}
+
static void outputDepFile(const std::string dfile, const std::string objfile,
std::vectorstd::string incs) {
@@ -132,16 +143,24 @@ static void outputDepFile(const std::string dfile, const
std::string objfile,
// FIXME should this be fatal or not? delete obj? delete d?
if (!out)
return;
+ std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
+ replaceAll(cwd, /, \\);
+ cwd.push_back('\\');
std::string tmp = objfile;
- doEscape(tmp, , \\ );
+ escapePath(tmp);
fprintf(out, %s: \\\n, tmp.c_str());
std::vectorstd::string::iterator it = incs.begin();
for (; it != incs.end(); ++it) {
tmp = *it;
-doEscape(tmp, \\, /);
-doEscape(tmp, , \\ );
+// The paths need to match the ones used to identify build artifacts in the
+// build.ninja file. Therefore we need to canonicalize the path to use
+// backward slashes and relativize the path to the build directory.
+replaceAll(tmp, /, \\);
+if (startsWith(tmp, cwd))
+ tmp = tmp.substr(cwd.size());
+escapePath(tmp);
fprintf(out, %s \\\n, tmp.c_str());
}
@@ -150,10 +169,6 @@ static void outputDepFile(const std::string dfile, const
std::string objfile,
}
-bool startsWith(const std::string str, const std::string what) {
- return str.compare(0, what.size(), what) == 0;
-}
-
bool contains(const std::string str, const std::string what) {
return str.find(what) != std::string::npos;
}
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmcldeps.cxx | 33 -
2 files changed, 25
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3304-g5eabee0
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 5eabee0bd6ec7632ab9db98e0d71860a0203f88a (commit)
via ded153c475af2d482e5903f7c128739f7ef7f8e9 (commit)
from adfb1689bf88067c94b72494fb44f81d2020732c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5eabee0bd6ec7632ab9db98e0d71860a0203f88a
commit 5eabee0bd6ec7632ab9db98e0d71860a0203f88a
Merge: adfb168 ded153c
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jul 23 14:57:23 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 23 14:57:23 2013 -0400
Merge topic 'ninja_bad_cmcldeps_paths' into next
ded153c Ninja: Update BuildDepends test to verify cmcldeps depfiles.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ded153c475af2d482e5903f7c128739f7ef7f8e9
commit ded153c475af2d482e5903f7c128739f7ef7f8e9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jul 23 14:53:00 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jul 23 14:53:00 2013 -0400
Ninja: Update BuildDepends test to verify cmcldeps depfiles.
diff --git a/Tests/BuildDepends/CMakeLists.txt
b/Tests/BuildDepends/CMakeLists.txt
index 2792751..ce0c039 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -93,6 +93,26 @@ if(NOT RESULT)
message(SEND_ERROR Could not build test project (1)!)
endif()
+# find and save the ninjadep executable
+set(ninjadep
${BuildDepends_BINARY_DIR}/Project/ninjadep${CMAKE_EXECUTABLE_SUFFIX})
+if(EXISTS
+
${BuildDepends_BINARY_DIR}/Project/Debug/ninjadep${CMAKE_EXECUTABLE_SUFFIX} )
+ message(found debug)
+ set(ninjadep
+
${BuildDepends_BINARY_DIR}/Project/Debug/ninjadep${CMAKE_EXECUTABLE_SUFFIX})
+endif()
+message(Running ${ninjadep} )
+execute_process(COMMAND ${ninjadep} OUTPUT_VARIABLE out RESULT_VARIABLE
runResult)
+string(REGEX REPLACE [\r\n] out ${out})
+message(Run result: ${runResult} Output: \${out}\)
+
+if(${out} STREQUAL HEADER_STRING: ninja )
+ message(Worked!)
+else()
+ message(SEND_ERROR Project did not rebuild properly. Output[${out}]\n
+ expected [HEADER_STRING: ninja])
+endif()
+
set(bar ${BuildDepends_BINARY_DIR}/Project/bar${CMAKE_EXECUTABLE_SUFFIX})
if(EXISTS
${BuildDepends_BINARY_DIR}/Project/Debug/bar${CMAKE_EXECUTABLE_SUFFIX} )
@@ -151,6 +171,8 @@ execute_process(COMMAND ${bar} -infinite TIMEOUT 3
OUTPUT_VARIABLE out)
message(Modifying Project/foo.cxx)
write_file(${BuildDepends_BINARY_DIR}/Project/foo.cxx
const char* foo() { return \foo changed\;} )
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/dir/header.txt
+ #define HEADER_STRING \ninja changed\\n )
file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot.hxx.in
static const char* zot = \zot changed\;\n)
file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_custom.hxx.in
@@ -204,6 +226,18 @@ if(EXISTS
message(found debug)
endif()
+message(Running ${ninjadep} )
+execute_process(COMMAND ${ninjadep} OUTPUT_VARIABLE out RESULT_VARIABLE
runResult)
+string(REGEX REPLACE [\r\n] out ${out})
+message(Run result: ${runResult} Output: \${out}\)
+
+if(${out} STREQUAL HEADER_STRING: ninja changed )
+ message(Worked!)
+else()
+ message(SEND_ERROR Project did not rebuild properly. Output[${out}]\n
+ expected [HEADER_STRING: ninja changed])
+endif()
+
message(Running ${bar} )
execute_process(COMMAND ${bar} OUTPUT_VARIABLE out RESULT_VARIABLE runResult)
string(REGEX REPLACE [\r\n] out ${out})
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt
b/Tests/BuildDepends/Project/CMakeLists.txt
index f8a3d15..df62fa6 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -123,3 +123,18 @@ add_custom_target(link_depends_no_shared_check ALL
-P ${CMAKE_CURRENT_SOURCE_DIR}/link_depends_no_shared_check.cmake
)
add_dependencies(link_depends_no_shared_check link_depends_no_shared_exe)
+
+# add a test for ninja dep handler
+add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
+ ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
+ )
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
+ PROPERTIES GENERATED 1)
+add_custom_target(header_tgt DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+add_executable(ninjadep ninjadep.cpp)
+add_dependencies(ninjadep header_tgt)
\ No newline at end of file
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3306-ge98b6a5
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 e98b6a559beaba092c2f42a127b723c29927b3d3 (commit)
via 3839acc31a3f2c731225636bae436d9bd185aa1b (commit)
from 5eabee0bd6ec7632ab9db98e0d71860a0203f88a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e98b6a559beaba092c2f42a127b723c29927b3d3
commit e98b6a559beaba092c2f42a127b723c29927b3d3
Merge: 5eabee0 3839acc
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jul 23 16:44:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 23 16:44:30 2013 -0400
Merge topic 'ninja_bad_cmcldeps_paths' into next
3839acc Add in missing files for the BuildDepends test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3839acc31a3f2c731225636bae436d9bd185aa1b
commit 3839acc31a3f2c731225636bae436d9bd185aa1b
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jul 23 15:38:34 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jul 23 16:26:38 2013 -0400
Add in missing files for the BuildDepends test.
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt
b/Tests/BuildDepends/Project/CMakeLists.txt
index df62fa6..cb4faee 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -126,15 +126,25 @@ add_dependencies(link_depends_no_shared_check
link_depends_no_shared_exe)
# add a test for ninja dep handler
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/dir/header.txt
+ ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
+ )
+
+add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_CURRENT_BINARY_DIR}/dir/header.txt
${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
)
+
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/dir/header.h
PROPERTIES GENERATED 1)
+
add_custom_target(header_tgt DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dir/header.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(ninjadep ninjadep.cpp)
-add_dependencies(ninjadep header_tgt)
\ No newline at end of file
+add_dependencies(ninjadep header_tgt)
diff --git a/Tests/BuildDepends/Project/dir/header.txt
b/Tests/BuildDepends/Project/dir/header.txt
new file mode 100644
index 000..f2355dc
--- /dev/null
+++ b/Tests/BuildDepends/Project/dir/header.txt
@@ -0,0 +1 @@
+#define HEADER_STRING ninja
\ No newline at end of file
diff --git a/Tests/BuildDepends/Project/ninjadep.cpp
b/Tests/BuildDepends/Project/ninjadep.cpp
new file mode 100644
index 000..8d61336
--- /dev/null
+++ b/Tests/BuildDepends/Project/ninjadep.cpp
@@ -0,0 +1,6 @@
+#include stdio.h
+#include dir/header.h
+
+int main() {
+ printf(HEADER_STRING: %s\n, HEADER_STRING);
+}
---
Summary of changes:
Tests/BuildDepends/Project/CMakeLists.txt | 16 +---
Tests/BuildDepends/Project/dir/header.txt |1 +
Tests/BuildDepends/Project/ninjadep.cpp |6 ++
3 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 Tests/BuildDepends/Project/dir/header.txt
create mode 100644 Tests/BuildDepends/Project/ninjadep.cpp
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3271-g632b3a8
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 632b3a823c97dd58d1d71c94ede866cd16a72015 (commit)
via 07646de0e37e1c51d5b8b6f2e101841ffcec2b68 (commit)
from 5c611402de0f8af1893e36d635b241ed61015949 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=632b3a823c97dd58d1d71c94ede866cd16a72015
commit 632b3a823c97dd58d1d71c94ede866cd16a72015
Merge: 5c61140 07646de
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 22 09:16:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 22 09:16:31 2013 -0400
Merge topic 'FindCuda_more_search_paths' into next
07646de FindCUDA: Search for libraries in
prefix/lib/arch/nvidida-current.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07646de0e37e1c51d5b8b6f2e101841ffcec2b68
commit 07646de0e37e1c51d5b8b6f2e101841ffcec2b68
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 22 09:12:29 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jul 22 09:12:29 2013 -0400
FindCUDA: Search for libraries in prefix/lib/arch/nvidida-current.
Correction from James Bigler to add the prefix/lib/arch/nvidida-current
to
the system find_library call which is used after the user libraries
have been searched.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 958ed15..0390ae4 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -602,13 +602,16 @@ macro(cuda_find_library_local_first_with_path_ext _var
_names _doc _path_ext )
PATHS ${CUDA_TOOLKIT_ROOT_DIR}
ENV CUDA_PATH
ENV CUDA_LIB_PATH
-/usr/lib/nvidia-current
PATH_SUFFIXES ${_cuda_64bit_lib_dir} ${_path_ext}lib/Win32
${_path_ext}lib ${_path_ext}libWin32
DOC ${_doc}
NO_DEFAULT_PATH
)
# Search default search paths, after we search our own set of paths.
- find_library(${_var} NAMES ${_names} DOC ${_doc})
+ find_library(${_var}
+NAMES ${_names}
+PATHS /usr/lib/nvidia-current
+DOC ${_doc}
+)
endmacro()
macro(cuda_find_library_local_first _var _names _doc)
---
Summary of changes:
Modules/FindCUDA.cmake |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3273-gf0256bc
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 f0256bcb76ea0038e6fa638ac793a2a45dbd032c (commit)
via 09f00a63713c06ffa1830eafb200bc3aa5220e64 (commit)
from 632b3a823c97dd58d1d71c94ede866cd16a72015 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0256bcb76ea0038e6fa638ac793a2a45dbd032c
commit f0256bcb76ea0038e6fa638ac793a2a45dbd032c
Merge: 632b3a8 09f00a6
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 22 09:25:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 22 09:25:25 2013 -0400
Merge topic 'FindCuda_more_search_paths' into next
09f00a6 FindCUDA: Search for libraries in
prefix/lib/arch/nvidida-current.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09f00a63713c06ffa1830eafb200bc3aa5220e64
commit 09f00a63713c06ffa1830eafb200bc3aa5220e64
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri May 24 10:03:57 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jul 22 09:16:11 2013 -0400
FindCUDA: Search for libraries in prefix/lib/arch/nvidida-current.
Ubuntu install the CUDA libraries into a location that is different
than the default location provided by the NVidia installer. So we
teach the FindCUDA package to also find the Ubuntu install location.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 5a680e3..0390ae4 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -607,7 +607,11 @@ macro(cuda_find_library_local_first_with_path_ext _var
_names _doc _path_ext )
NO_DEFAULT_PATH
)
# Search default search paths, after we search our own set of paths.
- find_library(${_var} NAMES ${_names} DOC ${_doc})
+ find_library(${_var}
+NAMES ${_names}
+PATHS /usr/lib/nvidia-current
+DOC ${_doc}
+)
endmacro()
macro(cuda_find_library_local_first _var _names _doc)
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3290-g14d87c2
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 14d87c255ff602bc4597aa687be09fb160f29b89 (commit)
via a11da72e7b465933eb4e92eee5db8e6d334e843b (commit)
from f399040862e426b4cb33e586a987b7f63550470e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14d87c255ff602bc4597aa687be09fb160f29b89
commit 14d87c255ff602bc4597aa687be09fb160f29b89
Merge: f399040 a11da72
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 22 11:15:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 22 11:15:30 2013 -0400
Merge topic 'windows_ninja_duplicate_paths' into next
a11da72 Ninja: Properly convert all paths to unix style before we do set
intersection.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a11da72e7b465933eb4e92eee5db8e6d334e843b
commit a11da72e7b465933eb4e92eee5db8e6d334e843b
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 22 10:32:06 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jul 22 10:42:37 2013 -0400
Ninja: Properly convert all paths to unix style before we do set
intersection.
On windows we had a subset of the paths as unix style and a subset as
windows
so when doing the set intersection it resulted in the same file being
found twice.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 9596ebc..578cb37 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -147,7 +147,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream os,
//we need to track every dependency that comes in, since we are trying
//to find dependencies that are side effects of build commands
//
-this-CombinedBuildExplicitDependencies.insert(*i);
+this-CombinedBuildExplicitDependencies.insert( EncodePath(*i) );
}
// Write implicit dependencies.
@@ -180,7 +180,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream os,
i != outputs.end(); ++i)
{
build EncodeIdent(EncodePath(*i), os);
-this-CombinedBuildOutputs.insert(*i);
+this-CombinedBuildOutputs.insert( EncodePath(*i) );
}
build :;
@@ -944,7 +944,7 @@ void
cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream os)
typedef std::vectorstd::string::const_iterator vect_it;
for(vect_it j = files.begin(); j != files.end(); ++j)
{
- knownDependencies.insert(ng-ConvertToNinjaPath( j-c_str() ));
+ knownDependencies.insert( ng-ConvertToNinjaPath( j-c_str() ) );
}
}
@@ -959,26 +959,15 @@ void
cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream os)
typedef std::vectorstd::string::const_iterator vect_it;
for(vect_it j = files.begin(); j != files.end(); ++j)
{
- knownDependencies.insert(ng-ConvertToNinjaPath( j-c_str() ));
+ knownDependencies.insert( ng-ConvertToNinjaPath( j-c_str() ) );
}
}
- //insert outputs from all WirteBuild commands
- for(std::setstd::string::iterator i = this-CombinedBuildOutputs.begin();
- i != this-CombinedBuildOutputs.end(); ++i)
-{
-knownDependencies.insert(*i);
-}
-
- //after we have combined the data into knownDependencies we have no need
- //to keep this data around
- this-CombinedBuildOutputs.clear();
-
for(TargetAliasMap::const_iterator i= this-TargetAliases.begin();
i != this-TargetAliases.end();
++i)
{
-knownDependencies.insert(i-first);
+knownDependencies.insert( ng-ConvertToNinjaPath(i-first.c_str()) );
}
//remove all source files we know will exist.
@@ -987,11 +976,26 @@ void
cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream os)
i != this-AssumedSourceDependencies.end();
++i)
{
-knownDependencies.insert(i-first);
+knownDependencies.insert( ng-ConvertToNinjaPath(i-first.c_str()) );
}
+ //insert outputs from all WirteBuild commands
+ for(std::setstd::string::iterator i = this-CombinedBuildOutputs.begin();
+ i != this-CombinedBuildOutputs.end(); ++i)
+{
+//these paths have already be encoded when added to CombinedBuildOutputs
+knownDependencies.insert(*i);
+}
+
+ //after we have combined the data into knownDependencies we have no need
+ //to keep this data around
+ this-CombinedBuildOutputs.clear();
+
//now we difference with CombinedBuildExplicitDependencies to find
- //the list of items we know nothing about
+ //the list of items we know nothing about.
+ //We have encoded all the paths
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2873-gf580516
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 f5805160c01d0b22882e7f3d3e94c653b3dd9ce1 (commit)
via 26e728f228989eb2bb9a853f04efd73937a3fd6f (commit)
from dab35af351de8c881f39732e82eae411bd10e533 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5805160c01d0b22882e7f3d3e94c653b3dd9ce1
commit f5805160c01d0b22882e7f3d3e94c653b3dd9ce1
Merge: dab35af 26e728f
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 1 13:42:17 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 1 13:42:17 2013 -0400
Merge topic 'vs-generator-brief-doc-update' into next
26e728f VS: Make it clear what Visual Studio edition each vs generator is
for.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26e728f228989eb2bb9a853f04efd73937a3fd6f
commit 26e728f228989eb2bb9a853f04efd73937a3fd6f
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 1 13:36:38 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jul 1 13:39:33 2013 -0400
VS: Make it clear what Visual Studio edition each vs generator is for.
Add to the brief documentation of each visual studio generator what
Visual Studio edition each generator is for. I want to clarify that
VS11 is for Visual Studio 2012, and VS12 is for Visual Studio 2013.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index b8c4939..1911197 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -45,7 +45,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 10;
-entry.Brief = Generates Visual Studio 10 project files.;
+entry.Brief = Generates Visual Studio 10 (Visual Studio 2010) project
files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx
b/Source/cmGlobalVisualStudio11Generator.cxx
index 299aaa8..71f8268 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -42,7 +42,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 11;
-entry.Brief = Generates Visual Studio 11 project files.;
+entry.Brief = Generates Visual Studio 11 (Visual Studio 2012) project
files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx
b/Source/cmGlobalVisualStudio12Generator.cxx
index 6468b9a..2411c3f 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -42,7 +42,8 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 12;
-entry.Brief = Generates Visual Studio 12 project files.;
+entry.Brief = Generates Visual Studio 12 (Visual Studio 2013)\
+ project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
---
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx |2 +-
Source/cmGlobalVisualStudio11Generator.cxx |2 +-
Source/cmGlobalVisualStudio12Generator.cxx |3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2875-gb77611c
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 b77611c2b9cc674208cdd3d3654d32f8cf78fc22 (commit)
via 5ddf0025004dab3184174f32b4c62573ac60e6b8 (commit)
from f5805160c01d0b22882e7f3d3e94c653b3dd9ce1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b77611c2b9cc674208cdd3d3654d32f8cf78fc22
commit b77611c2b9cc674208cdd3d3654d32f8cf78fc22
Merge: f580516 5ddf002
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 1 14:38:14 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 1 14:38:14 2013 -0400
Merge topic 'vs-generator-brief-doc-update' into next
5ddf002 KwStyle: Correct over 80 characters on a line.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ddf0025004dab3184174f32b4c62573ac60e6b8
commit 5ddf0025004dab3184174f32b4c62573ac60e6b8
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 1 14:36:35 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jul 1 14:36:35 2013 -0400
KwStyle: Correct over 80 characters on a line.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 1911197..f8aa4e6 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -45,7 +45,8 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 10;
-entry.Brief = Generates Visual Studio 10 (Visual Studio 2010) project
files.;
+entry.Brief = Generates Visual Studio 10 (Visual Studio 2010)\
+ project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx
b/Source/cmGlobalVisualStudio11Generator.cxx
index 71f8268..c398672 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -42,7 +42,8 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 11;
-entry.Brief = Generates Visual Studio 11 (Visual Studio 2012) project
files.;
+entry.Brief = Generates Visual Studio 11 (Visual Studio 2012)\
+ project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx
b/Source/cmGlobalVisualStudio12Generator.cxx
index 2411c3f..2a019bc 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -43,7 +43,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 12;
entry.Brief = Generates Visual Studio 12 (Visual Studio 2013)\
- project files.;
+ project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
---
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx |3 ++-
Source/cmGlobalVisualStudio11Generator.cxx |3 ++-
Source/cmGlobalVisualStudio12Generator.cxx |2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2877-g68f97b8
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 68f97b840aea0fd5a9924a805a9210da9d8a1735 (commit)
via 413dfbd9601af4c783891e099b146e2f8f656cb4 (commit)
from b77611c2b9cc674208cdd3d3654d32f8cf78fc22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68f97b840aea0fd5a9924a805a9210da9d8a1735
commit 68f97b840aea0fd5a9924a805a9210da9d8a1735
Merge: b77611c 413dfbd
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 1 15:09:03 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 1 15:09:03 2013 -0400
Merge topic 'vs-generator-brief-doc-update' into next
413dfbd VS: Shorten the Visual Studio brief documentation so it is a single
line.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=413dfbd9601af4c783891e099b146e2f8f656cb4
commit 413dfbd9601af4c783891e099b146e2f8f656cb4
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jul 1 15:05:01 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jul 1 15:05:01 2013 -0400
VS: Shorten the Visual Studio brief documentation so it is a single line.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index f8aa4e6..ee7c56f 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -45,8 +45,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 10;
-entry.Brief = Generates Visual Studio 10 (Visual Studio 2010)\
- project files.;
+entry.Brief = Generates Visual Studio 10 (2010) project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx
b/Source/cmGlobalVisualStudio11Generator.cxx
index c398672..624d01d 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -42,8 +42,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 11;
-entry.Brief = Generates Visual Studio 11 (Visual Studio 2012)\
- project files.;
+entry.Brief = Generates Visual Studio 11 (2012) project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx
b/Source/cmGlobalVisualStudio12Generator.cxx
index 2a019bc..d77b84d 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -42,8 +42,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry entry) const {
entry.Name = Visual Studio 12;
-entry.Brief = Generates Visual Studio 12 (Visual Studio 2013)\
- project files.;
+entry.Brief = Generates Visual Studio 12 (2013) project files.;
entry.Full =
It is possible to append a space followed by the platform name
to create project files for a specific target platform. E.g.
---
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx |3 +--
Source/cmGlobalVisualStudio11Generator.cxx |3 +--
Source/cmGlobalVisualStudio12Generator.cxx |3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2748-gb469e1b
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 b469e1b3af59a598c2203127c58f1ab333417909 (commit)
via feac4f4e71cc00b0ecc5ca78bbf7b96f5013dcb3 (commit)
from da734685fcba3eee125798418ab45786535e8685 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b469e1b3af59a598c2203127c58f1ab333417909
commit b469e1b3af59a598c2203127c58f1ab333417909
Merge: da73468 feac4f4
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Jun 26 08:29:54 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 26 08:29:54 2013 -0400
Merge topic 'ninja_phony_targets' into next
feac4f4 Ninja: Fix Line Length style error.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=feac4f4e71cc00b0ecc5ca78bbf7b96f5013dcb3
commit feac4f4e71cc00b0ecc5ca78bbf7b96f5013dcb3
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Wed Jun 26 08:28:45 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Wed Jun 26 08:28:45 2013 -0400
Ninja: Fix Line Length style error.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 272e749..9ed0200 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -939,7 +939,8 @@ void
cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream os)
{
//get the vector of files created by this makefile and convert them
//to ninja paths, which are all relative in respect to the build directory
-const std::vectorstd::string files =
(*i)-GetMakefile()-GetOutputFiles();
+const std::vectorstd::string files =
+(*i)-GetMakefile()-GetOutputFiles();
typedef std::vectorstd::string::const_iterator vect_it;
for(vect_it j = files.begin(); j != files.end(); ++j)
{
---
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2746-gda73468
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 da734685fcba3eee125798418ab45786535e8685 (commit)
via bd2ce852e1f425fc3d86a8b81375a2bccd76a3b9 (commit)
via 20d7ae7b4827bbeba84cb3a54c1808eb43f725f0 (commit)
via 88d27ad0140ac2274e886c10ac2bf9f8eede54c7 (commit)
from 92cd8f4a792d9a0306e66e28d581b3001412be62 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da734685fcba3eee125798418ab45786535e8685
commit da734685fcba3eee125798418ab45786535e8685
Merge: 92cd8f4 bd2ce85
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 25 15:54:24 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 25 15:54:24 2013 -0400
Merge topic 'ninja_phony_targets' into next
bd2ce85 Ninja: Custom Command file depends don't need to exist before
building
20d7ae7 Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non
static
88d27ad Add a test to expose a bug with add_custom_command and ninja.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd2ce852e1f425fc3d86a8b81375a2bccd76a3b9
commit bd2ce852e1f425fc3d86a8b81375a2bccd76a3b9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jun 7 14:26:03 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jun 25 14:43:47 2013 -0400
Ninja: Custom Command file depends don't need to exist before building
When converting custom commands for the ninja build system we
need to make sure that any file dependencies that exist in the build
tree are converted to phony targets. This tells ninja that these
files might not exist when starting the build, but could be generated
during the build.
This is done by tracking all dependencies for custom command targets.
After all have been written out we remove all items from the set
that have been seen as a; target, custom command output, an alias,
or a file in the source directory. Anything that is left is considered
to be a file that will be generated as a side effect of another
custom command.
Conflicts:
Source/cmGlobalNinjaGenerator.cxx
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 8587e0d..272e749 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -10,11 +10,12 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
*/
+#include cmGeneratedFileStream.h
+#include cmGeneratorExpressionEvaluationFile.h
+#include cmGeneratorTarget.h
#include cmGlobalNinjaGenerator.h
#include cmLocalNinjaGenerator.h
#include cmMakefile.h
-#include cmGeneratedFileStream.h
-#include cmGeneratorTarget.h
#include cmVersion.h
#include algorithm
@@ -140,8 +141,15 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream os,
for(cmNinjaDeps::const_iterator i = explicitDeps.begin();
i != explicitDeps.end();
++i)
+{
arguments EncodeIdent(EncodePath(*i), os);
+//we need to track every dependency that comes in, since we are trying
+//to find dependencies that are side effects of build commands
+//
+this-CombinedBuildExplicitDependencies.insert(*i);
+}
+
// Write implicit dependencies.
if(!implicitDeps.empty())
{
@@ -170,7 +178,10 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream os,
build build;
for(cmNinjaDeps::const_iterator i = outputs.begin();
i != outputs.end(); ++i)
+{
build EncodeIdent(EncodePath(*i), os);
+this-CombinedBuildOutputs.insert(*i);
+}
build :;
// Write the rule.
@@ -478,6 +489,7 @@ void cmGlobalNinjaGenerator::Generate()
this-WriteAssumedSourceDependencies();
this-WriteTargetAliases(*this-BuildFileStream);
+ this-WriteUnknownExplicitDependencies(*this-BuildFileStream);
this-WriteBuiltinTargets(*this-BuildFileStream);
if (cmSystemTools::GetErrorOccuredFlag()) {
@@ -887,7 +899,7 @@ void
cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream os)
cmGlobalNinjaGenerator::WriteDivider(os);
os # Target aliases.\n\n;
- for (TargetAliasMap::iterator i = TargetAliases.begin();
+ for (TargetAliasMap::const_iterator i = TargetAliases.begin();
i != TargetAliases.end(); ++i) {
// Don't write ambiguous aliases.
if (!i-second)
@@ -903,6 +915,113 @@ void
cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream os)
}
}
+void cmGlobalNinjaGenerator
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2720-g414a447
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 414a447c14b02e00b3917b3f09033236605524ec (commit)
via 6dbd4a5f17db42d12cdddcdacf5f9bd4d67951d6 (commit)
from c94a4c5d5fe6a06c317e9a65ba64876a737dd7c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414a447c14b02e00b3917b3f09033236605524ec
commit 414a447c14b02e00b3917b3f09033236605524ec
Merge: c94a4c5 6dbd4a5
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 24 11:05:43 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 24 11:05:43 2013 -0400
Merge topic 'makefile_AddCMakeOutputFile_signature' into next
6dbd4a5 cmMakefile: Refactor AddCMakeDependFile and AddCMakeOutputFile.
diff --cc Source/cmMakefile.cxx
index a6d61e5,d5d99a0..f3a66ba
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -3369,9 -3369,8 +3369,9 @@@ int cmMakefile::ConfigureFile(const cha
}
std::string soutfile = outfile;
std::string sinfile = infile;
- this-AddCMakeDependFile(infile);
+ this-AddCMakeDependFile(sinfile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
+ this-AddCMakeOutputFile(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
std::string::size_type pos = soutfile.rfind('/');
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dbd4a5f17db42d12cdddcdacf5f9bd4d67951d6
commit 6dbd4a5f17db42d12cdddcdacf5f9bd4d67951d6
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 18 13:41:50 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 24 10:43:20 2013 -0400
cmMakefile: Refactor AddCMakeDependFile and AddCMakeOutputFile.
AddCMakeDependFile and AddCMakeOutputFile both store as std::string
and all calling sites use std::string. So instead of creating more
temporary objects, lets just use std::strings.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index b43a7a7..860417f 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -396,7 +396,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
// Add dependencies on any non-temporary sources.
if(si-find(CMakeTmp) == si-npos)
{
-this-Makefile-AddCMakeDependFile(si-c_str());
+this-Makefile-AddCMakeDependFile(*si);
}
}
fprintf(fout, )\n);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d58d68..d5d99a0 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3369,7 +3369,7 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
}
std::string soutfile = outfile;
std::string sinfile = infile;
- this-AddCMakeDependFile(infile);
+ this-AddCMakeDependFile(sinfile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a87752..4297155 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -648,7 +648,7 @@ public:
const std::vectorstd::string GetListFiles() const
{ return this-ListFiles; }
///! When the file changes cmake will be re-run from the build system.
- void AddCMakeDependFile(const char* file)
+ void AddCMakeDependFile(const std::string file)
{ this-ListFiles.push_back(file);}
/**
@@ -666,7 +666,7 @@ public:
*/
const std::vectorstd::string GetOutputFiles() const
{ return this-OutputFiles; }
- void AddCMakeOutputFile(const char* file)
+ void AddCMakeOutputFile(const std::string file)
{ this-OutputFiles.push_back(file);}
/**
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index d3cdf85..a475c7c 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -49,7 +49,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string
targetName,
out += /;
out += this-Target-GetAppBundleDirectory(this-ConfigName, false);
cmSystemTools::MakeDirectory(out.c_str());
- this-Makefile-AddCMakeOutputFile(out.c_str());
+ this-Makefile-AddCMakeOutputFile(out);
std::string newoutpath = out;
@@ -62,7 +62,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string
targetName,
this-LocalGenerator-GenerateAppleInfoPList(this-Target,
targetName.c_str(),
plist.c_str());
- this-Makefile-AddCMakeOutputFile(plist.c_str());
+ this-Makefile-AddCMakeOutputFile(plist);
outpath
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2724-gfb3e38b
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 fb3e38b4ba8732324737f59c5ff3a1c33bc7207c (commit)
via 578efdf60dfc2e7005c8de7883ce5ada4c2fc2f9 (commit)
via 48786494349cf4c92a38865723a640501e588be8 (commit)
via 4807eebbb10494cc26473300683c7211d9bc38f5 (commit)
from 414a447c14b02e00b3917b3f09033236605524ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb3e38b4ba8732324737f59c5ff3a1c33bc7207c
commit fb3e38b4ba8732324737f59c5ff3a1c33bc7207c
Merge: 414a447 578efdf
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 24 11:05:59 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 24 11:05:59 2013 -0400
Merge topic '13582_configured_file_regeneration' into next
578efdf cmMakefile: Track configured files so we can regenerate them.
4878649 Ninja: Track configured files so we can regenerate them.
4807eeb Merge branch 'makefile_AddCMakeOutputFile_signature' into
13582_configured_file_regeneration
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=578efdf60dfc2e7005c8de7883ce5ada4c2fc2f9
commit 578efdf60dfc2e7005c8de7883ce5ada4c2fc2f9
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 18 13:50:54 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 24 11:01:24 2013 -0400
cmMakefile: Track configured files so we can regenerate them.
Currently when a configured file is removed from the build directory,
running the build command will not regenerate the file. Now detect
this and will rerun cmake properly when a user issues the build
command.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d5d99a0..a6d61e5 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3369,8 +3369,9 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
}
std::string soutfile = outfile;
std::string sinfile = infile;
- this-AddCMakeDependFile(sinfile);
+ this-AddCMakeDependFile(infile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
+ this-AddCMakeOutputFile(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
std::string::size_type pos = soutfile.rfind('/');
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48786494349cf4c92a38865723a640501e588be8
commit 48786494349cf4c92a38865723a640501e588be8
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 17 11:25:39 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 24 11:01:24 2013 -0400
Ninja: Track configured files so we can regenerate them.
Unlike the Makefile generator the ninja generator did not tack any of
its output files, so if they are deleted the generator would not run.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index fff972e..e2c0e18 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -961,6 +961,9 @@ void
cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream os)
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
+
+const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
+implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
}
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4807eebbb10494cc26473300683c7211d9bc38f5
commit 4807eebbb10494cc26473300683c7211d9bc38f5
Merge: 0bd82cb 6dbd4a5
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 24 11:00:38 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 24 11:00:38 2013 -0400
Merge branch 'makefile_AddCMakeOutputFile_signature' into
13582_configured_file_regeneration
---
Summary of changes:
Source/cmMakefile.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2726-gbbbd47c
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 bbbd47ce5da77884b0410d687f306fb1c52f886c (commit) via 7b7dd69023a062d579a31162b10db63558437432 (commit) from fb3e38b4ba8732324737f59c5ff3a1c33bc7207c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbbd47ce5da77884b0410d687f306fb1c52f886c commit bbbd47ce5da77884b0410d687f306fb1c52f886c Merge: fb3e38b 7b7dd69 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Jun 24 11:07:48 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jun 24 11:07:48 2013 -0400 Merge topic '13582_configured_file_regeneration' into next 7b7dd69 cmMakefile: Pass std::string instead of a const char*. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b7dd69023a062d579a31162b10db63558437432 commit 7b7dd69023a062d579a31162b10db63558437432 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Mon Jun 24 11:06:36 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Mon Jun 24 11:06:54 2013 -0400 cmMakefile: Pass std::string instead of a const char*. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index a6d61e5..f3a66ba 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3369,7 +3369,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile, } std::string soutfile = outfile; std::string sinfile = infile; - this-AddCMakeDependFile(infile); + this-AddCMakeDependFile(sinfile); cmSystemTools::ConvertToUnixSlashes(soutfile); this-AddCMakeOutputFile(soutfile); mode_t perm = 0; --- Summary of changes: Source/cmMakefile.cxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2728-g6a5d577
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 6a5d577d67e5845aee01d2020ae1dc7252d993e7 (commit)
via c77b275f4761ea8f578877288dffac732ad16117 (commit)
from bbbd47ce5da77884b0410d687f306fb1c52f886c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a5d577d67e5845aee01d2020ae1dc7252d993e7
commit 6a5d577d67e5845aee01d2020ae1dc7252d993e7
Merge: bbbd47c c77b275
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 24 11:09:03 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 24 11:09:03 2013 -0400
Merge topic '13582_configured_file_regeneration' into next
c77b275 cmMakefile: Track configured files so we can regenerate them.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c77b275f4761ea8f578877288dffac732ad16117
commit c77b275f4761ea8f578877288dffac732ad16117
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 18 13:50:54 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 24 11:08:05 2013 -0400
cmMakefile: Track configured files so we can regenerate them.
Currently when a configured file is removed from the build directory,
running the build command will not regenerate the file. Now detect
this and will rerun cmake properly when a user issues the build
command.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d5d99a0..f3a66ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3371,6 +3371,7 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
std::string sinfile = infile;
this-AddCMakeDependFile(sinfile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
+ this-AddCMakeOutputFile(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
std::string::size_type pos = soutfile.rfind('/');
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2659-gaa9cd38
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 aa9cd38cca21e92317a75266af26ec60667f21cf (commit)
via 8ee9a02e66685d7c2aa243022ab3277fcc594279 (commit)
via 7984224b1700bf3d522b630e8fdd52101b1a0e51 (commit)
via 8bf5c9cc4aff6df2a8719b063266e56e00dac123 (commit)
from 2ce2ae130a8f7a1a8087f2e5703070890df16bad (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa9cd38cca21e92317a75266af26ec60667f21cf
commit aa9cd38cca21e92317a75266af26ec60667f21cf
Merge: 2ce2ae1 8ee9a02
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 18 15:32:54 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 18 15:32:54 2013 -0400
Merge topic '13582_configured_file_regeneration' into next
8ee9a02 Ninja: Track configured files so we can regenerate them.
7984224 cmMakefile: Track configured files so we can regenerate them.
8bf5c9c Merge branch 'makefile_AddCMakeOutputFile_signature' into
13582_configured_file_regeneration
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ee9a02e66685d7c2aa243022ab3277fcc594279
commit 8ee9a02e66685d7c2aa243022ab3277fcc594279
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 17 11:25:39 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jun 18 15:31:41 2013 -0400
Ninja: Track configured files so we can regenerate them.
Unlike the Makefile generator the ninja generator did not tack any of
its output files, so if they are deleted the generator would not run.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index fff972e..e2c0e18 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -961,6 +961,9 @@ void
cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream os)
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
+
+const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
+implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
}
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7984224b1700bf3d522b630e8fdd52101b1a0e51
commit 7984224b1700bf3d522b630e8fdd52101b1a0e51
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 18 13:50:54 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jun 18 15:31:36 2013 -0400
cmMakefile: Track configured files so we can regenerate them.
Currently when a configured file is removed from the build directory,
running the build command will not regenerate the file. Now detect
this and will rerun cmake properly when a user issues the build
command.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d5d99a0..a6d61e5 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3369,8 +3369,9 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
}
std::string soutfile = outfile;
std::string sinfile = infile;
- this-AddCMakeDependFile(sinfile);
+ this-AddCMakeDependFile(infile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
+ this-AddCMakeOutputFile(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
std::string::size_type pos = soutfile.rfind('/');
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bf5c9cc4aff6df2a8719b063266e56e00dac123
commit 8bf5c9cc4aff6df2a8719b063266e56e00dac123
Merge: 82771f1 0b4a23c
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Tue Jun 18 15:30:52 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Tue Jun 18 15:30:52 2013 -0400
Merge branch 'makefile_AddCMakeOutputFile_signature' into
13582_configured_file_regeneration
---
Summary of changes:
Source/cmMakefile.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2643-g6a0bf5e
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 6a0bf5e755dfa6e7572c0a84dd23056fa51e7220 (commit)
via bd1eb6bcb9cce06c06cb4e7bc0f0fe59b821a29d (commit)
via 4f09d966c230a5b2a834c6a3bc52da0d65f64cc2 (commit)
via 21bf95da632284e268afe53f37c21d470ba891df (commit)
from 6b290348ef13fd82f8c2a6c448819eefd1dea957 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a0bf5e755dfa6e7572c0a84dd23056fa51e7220
commit 6a0bf5e755dfa6e7572c0a84dd23056fa51e7220
Merge: 6b29034 bd1eb6b
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 17 13:29:19 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 17 13:29:19 2013 -0400
Merge topic '13582_configured_file_regeneration' into next
bd1eb6b Merge topic 'add-try_compile-options' into
13582_configured_file_regeneration
4f09d96 Update the ninja generator to track configured files.
21bf95d When configured files are modified we should regenerate them.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd1eb6bcb9cce06c06cb4e7bc0f0fe59b821a29d
commit bd1eb6bcb9cce06c06cb4e7bc0f0fe59b821a29d
Merge: 4f09d96 482f112
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 17 13:24:44 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 17 13:28:35 2013 -0400
Merge topic 'add-try_compile-options' into
13582_configured_file_regeneration
Conflicts:
Source/cmCoreTryCompile.cxx
diff --cc Source/cmCoreTryCompile.cxx
index da36b8f,b43a7a7..860417f
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@@ -357,7 -387,19 +387,19 @@@ int cmCoreTryCompile::TryCompileCode(st
fprintf(fout, SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY \%s\)\n,
this-BinaryDirectory.c_str());
/* Create the actual executable. */
- fprintf(fout, ADD_EXECUTABLE(%s \%s\)\n, targetName, source.c_str());
+ fprintf(fout, ADD_EXECUTABLE(%s, targetName);
+ for(std::vectorstd::string::iterator si = sources.begin();
+ si != sources.end(); ++si)
+ {
+ fprintf(fout, \%s\, si-c_str());
+
+ // Add dependencies on any non-temporary sources.
+ if(si-find(CMakeTmp) == si-npos)
+ {
-this-Makefile-AddCMakeDependFile(si-c_str());
++this-Makefile-AddCMakeDependFile(*si);
+ }
+ }
+ fprintf(fout, )\n);
if (useOldLinkLibs)
{
fprintf(fout,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f09d966c230a5b2a834c6a3bc52da0d65f64cc2
commit 4f09d966c230a5b2a834c6a3bc52da0d65f64cc2
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Mon Jun 17 11:25:39 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 17 11:25:39 2013 -0400
Update the ninja generator to track configured files.
Unlike the Makefile generator the ninja generator did not tack any of
its output files, so if they changed the generator would not rerun.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index fff972e..e2c0e18 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -961,6 +961,9 @@ void
cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream os)
this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i) {
const std::vectorstd::string lf = (*i)-GetMakefile()-GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
+
+const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
+implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
}
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21bf95da632284e268afe53f37c21d470ba891df
commit 21bf95da632284e268afe53f37c21d470ba891df
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Fri Jun 14 16:59:39 2013 -0400
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Mon Jun 17 11:12:16 2013 -0400
When configured files are modified we should regenerate them.
Currently when a configured file is removed from the build directory,
running the build command will not regenerate the file. Now detect
this and will rerun cmake properly when a user issues the build
command.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index bf28428..da36b8f 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
[Cmake-commits] CMake branch, release, updated. v2.8.10.2-1030-g6162e0f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, release has been updated via 6162e0ff2d20d70cb2f7ef6714e05ca65aed3123 (commit) via b882ef7565528c4009eca45bdc428c5c89c3dff9 (commit) via ff298fff79b2dd9773f027573c7f862a18e0bc36 (commit) via 6c6bfe1509e8593539d551787029fcb360127d1b (commit) via 0483bf8062822b56158740e5cbe897b728d9809c (commit) via dea1df4e5e05b8ba3de5099741a50cdea384f88e (commit) via 26dba6a1622422d3742254aa2ecab97f9a58cb2b (commit) via b8259c3d69258b884383559b74d37486b6a06ca2 (commit) via b85f691d78b4f37f05304e95e853b6c01f01bd25 (commit) via 4cb77c4a0eef23f25137c3e7162f4847d2634f8d (commit) via 21bdeadf00eb66d1e6c14b99ef0b67432d6fe31b (commit) via 41839d6fb690225c5779b02d113d0d38ee77d9ba (commit) via d94eae435654229cef686ac4f7ab92098da2ce99 (commit) via e9e088a4df62f33cacffe7bfd1840ade3ac52db8 (commit) via 2618e0257e5c6fdca4137b371153fbf1152cbef5 (commit) via 2ba65cc9d904b634120b1b56eabd046aad33ac75 (commit) via c80594ba1274c3dc44c3f2efd70bd5c3d9066bf5 (commit) via 77df4ef5ac3b8fcae52d8f964756ec4fdf35e5c5 (commit) via 82f5936a8bc2a16c6d2c5e003a38cbc150cf349a (commit) via c8b34729d90366a7dfee7b0d4a3df1ebfd7cdeab (commit) via 78185f598c152b1dbce632e953874ce8132c5fe9 (commit) via 90bd16419343ada9f026ce8387fafff9c3546a10 (commit) via 2baf851c34357cbb752bb91b99b835d3847b23a1 (commit) via e55b8ce4a4f5d6a935fe82d600637c79e64e8cbd (commit) via d37fe5bc5b328fae6b03af033ba69651f045df80 (commit) via 50e96802d2ad81f69d72dc87de80eee74d7a8dc9 (commit) via e6c3595fde100b62f021ddb253b81fe3ecc9328b (commit) from 573f39cb2ad6dcf70f85514132a504e9c2da1e0b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6162e0ff2d20d70cb2f7ef6714e05ca65aed3123 commit 6162e0ff2d20d70cb2f7ef6714e05ca65aed3123 Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue May 7 11:56:31 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Tue May 7 11:56:31 2013 -0400 CMake 2.8.11-rc4 diff --git a/ChangeLog.manual b/ChangeLog.manual index 2a44133..970d67c 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,13 @@ +Changes in CMake 2.8.11-rc4 (since 2.8.11-rc3) +-- +Brad King (1): + target_link_libraries: Update usage requirements documentation + +Stephen Kelly (3): + Centralize maintenance of usage requirement include directories + Fix include dir propagation from conditionally linked targets + Memoize usage requirement include directories in a config-specific map + Changes in CMake 2.8.11-rc3 (since 2.8.11-rc2) -- Brad King (1): diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ce99a2c..9ca7add 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -3,4 +3,4 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) set(CMake_VERSION_TWEAK 0) -set(CMake_VERSION_RC 3) +set(CMake_VERSION_RC 4) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b882ef7565528c4009eca45bdc428c5c89c3dff9 commit b882ef7565528c4009eca45bdc428c5c89c3dff9 Merge: ff298ff 573f39c Author: Robert Maynard robert.mayn...@kitware.com AuthorDate: Tue May 7 11:33:14 2013 -0400 Commit: Robert Maynard robert.mayn...@kitware.com CommitDate: Tue May 7 11:33:14 2013 -0400 Merge branch 'release' --- Summary of changes: ChangeLog.manual| 10 + Source/CMakeVersion.cmake |2 +- Source/cmTarget.cxx | 68 -- Source/cmTarget.h |1 - Source/cmTargetLinkLibrariesCommand.cxx |8 Source/cmTargetLinkLibrariesCommand.h | 19 + 6 files changed, 76 insertions(+), 32 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2798-gdb303a4
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 db303a426c29011d766496b004766f3d9e6f5f3a (commit)
via a8c4ff269f49d5f832cd91da54bf799958b78650 (commit)
from 14d3e9c11ee22535c2f6ecd0fb0c396859381953 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db303a426c29011d766496b004766f3d9e6f5f3a
commit db303a426c29011d766496b004766f3d9e6f5f3a
Merge: 14d3e9c a8c4ff2
Author: Robert Maynard robert.mayn...@kitware.com
AuthorDate: Thu Apr 18 09:00:35 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Apr 18 09:00:35 2013 -0400
Merge topic 'cuda_compute_build_path' into next
a8c4ff2 FindCuda: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8c4ff269f49d5f832cd91da54bf799958b78650
commit a8c4ff269f49d5f832cd91da54bf799958b78650
Author: Mathias Gaunard math...@gaunard.com
AuthorDate: Wed Mar 27 11:33:36 2013 +0100
Commit: Robert Maynard robert.mayn...@kitware.com
CommitDate: Thu Apr 18 08:51:11 2013 -0400
FindCuda: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.
make CUDA_COMPUTE_BUILD_PATH use a relative path to the current
binary directory instead of the current source directory if the source
file considered is in the current binary directory. This is done to
shorten the paths given to the compiler.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 423ad3d..8248624 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -920,7 +920,13 @@ function(CUDA_COMPUTE_BUILD_PATH path build_path)
if (IS_ABSOLUTE ${bpath})
# Absolute paths are generally unnessary, especially if something like
# file(GLOB_RECURSE) is used to pick up the files.
-file(RELATIVE_PATH bpath ${CMAKE_CURRENT_SOURCE_DIR} ${bpath})
+
+string(FIND ${bpath} ${CMAKE_CURRENT_BINARY_DIR} _binary_dir_pos)
+if (_binary_dir_pos EQUAL 0)
+ file(RELATIVE_PATH bpath ${CMAKE_CURRENT_BINARY_DIR} ${bpath})
+else()
+ file(RELATIVE_PATH bpath ${CMAKE_CURRENT_SOURCE_DIR} ${bpath})
+endif()
endif()
# This recipie is from cmLocalGenerator::CreateSafeUniqueObjectFileName in
the
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
