summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-105-3/+25
|\
| * ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-105-3/+25
| | | | | | | | | | | | | | | | | | | | Fix passing a list to the CMAKE_CACHE_ARGS and CMAKE_CACHE_DEFAULT_ARGS options of ExternalProject_Add. Following commit v3.7.0-rc1~273^2~1 (prefer list(APPEND) over string(APPEND) where appropriate, 2016-08-08), the semicolon list separator after the first list element was missing in the generated cache.
* | Merge branch 'vs15-separate-flag-table' into releaseBrad King2016-10-103-3/+247
|\ \
| * | VS: Split flag table between v140 and v141 toolsetsBrad King2016-10-103-3/+247
| |/ | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~156^2~1 (VS: Update v140 flag tables from VS 15 MSBuild files, 2016-09-02) we extended the v140 flag table with values from the v141 toolset that comes with VS 15. However, the v140 toolset that comes with VS 14 does not have all of these entries and so the flags just need to be passed without special mapping. In order to support both toolsets, split our CL flag table into separate copies for each version and switch off the toolset name. Closes: #16352
* | Merge branch 'update-kwsys' into releaseBrad King2016-10-081-11/+9
|\ \
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-081-11/+9
| |\ \ | | |/ | |/| | | | | | | * upstream-KWSys: KWSys 2016-10-07 (dfe9b386)
| | * KWSys 2016-10-07 (dfe9b386)KWSys Upstream2016-10-081-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit dfe9b38635d80cb5253187c1ddf90923e1b9effd (master). Upstream Shortlog ----------------- Brad King (1): dfe9b386 SystemTools: Re-implement Strucmp
* | | Merge branch 'android-export-has-cpp' into releaseBrad King2016-10-075-1/+22
|\ \ \
| * | | Android: Record use of C++ by static libs in exported Android.mk filesBrad King2016-10-075-1/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | When a `PREBUILT_STATIC_LIBRARY` uses C++ in its sources then the `.a` file will have a link-time dependency on the C++ runtime libraries. Android NDK r14 will add a way to give this information to the NDK build system by adding a `LOCAL_HAS_CPP` setting to the `Android.mk` file. Add this for exported static libraries that use C++.
* | | Merge branch 'FindProtobuf-fix-subdirs' into releaseBrad King2016-10-071-6/+10
|\ \ \
| * | | FindProtobuf: Fix protobuf_generate_*() to handle subdirsMartin Joly2016-10-071-6/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~513^2 (FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs, 2016-06-09) incorrectly adds subdirectories to the path of the generated files when `*.proto` files are passed to `protobuf_generate_*` with subdirectories. This behavior is not correct when `PROTOBUF_GENERATE_CPP_APPEND_PATH` is True (default behavior) as `protoc` will generate output file in the current build directory.
* | | Merge branch 'android-cxxabi' into releaseBrad King2016-10-073-0/+7
|\ \ \
| * | | Android: Fix support for cxxabi.h with libc++Brad King2016-10-073-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Additional include directories are needed for this on some STL types. Closes: #16350
* | | | Merge branch 'check-libuv-minimum-version' into releaseBrad King2016-10-071-2/+6
|\ \ \ \
| * | | | Set minimum version for LibUV to 1.0.0Chuck Atkins2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of libuv did not have the uv_loop_close API. It first showed up in unstable releases ~ v0.11.20 but was not available in a stable release until v1.0
| * | | | Use find_package for JsonCpp and LibUV instead of includeChuck Atkins2016-10-071-2/+6
| | | | |
* | | | | Merge branch 'codelite-global-setting' into releaseBrad King2016-10-074-5/+27
|\ \ \ \ \
| * | | | | Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globallyStephen Kelly2016-10-072-5/+4
| | | | | |
| * | | | | cmGlobalGenerator: Add API to get settings from top-level cmMakefileStephen Kelly2016-10-062-0/+23
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At generate-time, definitions are sometimes read from a nearby cmMakefile, making the value directory-specific because they are read once per directory. Often however, the intention is more often to create a 'global' setting, such that the user writes for example: set(CMAKE_IMPORT_LIBRARY_SUFFIX something) once at the top level of their project. Many of these are also set by internal platform files, such as CMAKE_EXTRA_LINK_EXTENSIONS. The set() definitions are not really suitable for 'global' settings because they can be different for each directory, and code consuming the settings must assume they are different for each directory, and read it freshly each time with new allocations. CMake has other variable types which are global in scope, such as global properties, and cache variables. These are less convenient to populate for users, so establish a convention and API using the value as it is at the end of the top-level CMakeLists file.
* | | | | Merge branch 'android-ndk-r13' into releaseBrad King2016-10-062-3/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Android: Update libc++ include directories for NDK r13Brad King2016-10-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android NDK r13 moved the libc++ include directories. Closes: #16346
| * | | | Android: Suppress -Wattributes warnings in test case buildsBrad King2016-10-061-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `-Werror` in the Android test builds to make sure there are no warnings that we care about (e.g. unused flags). However, the NDK r13 tools produce a warning about their own builtins: ``` <built-in>: In function 'float abs(float)': <built-in>: warning: conflicts with previous declaration here [-Wattributes] ``` Suppress this warning so that we can continue using `-Werror` but tolerate these warnings.
* | | | Merge branch 'cpack-rpm-debuginfo-fixes' into releaseBrad King2016-10-061-28/+40
|\ \ \ \
| * | | | CPack/RPM debuginfo package without binariesDomen Vrankar2016-10-061-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Handle case when a component doesn't contain any debuginfo symbols.
| * | | | CPack/RPM debuginfo package objdump error suppressionDomen Vrankar2016-10-061-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | objdump prints out error text if file is not an executable and that should be suppressed as we don't care about non executable files during that test
* | | | Merge branch 'FindMatlab-fix-simulink-cache' into releaseBrad King2016-10-051-0/+1
|\ \ \ \
| * | | | FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfiguredRaffi Enficiaud2016-10-051-0/+1
| | |/ / | |/| |
* | | | Merge branch 'FindMatlab-documentation' into releaseBrad King2016-10-052-9/+15
|\ \ \ \
| * | | | Help: Extend 3.7 release notes for FindMatlabRaffi Enficiaud2016-10-051-1/+8
| | | | |
| * | | | FindMatlab: small documentation fixesRaffi Enficiaud2016-10-051-8/+7
| |/ / /
* | | | Merge branch 'fix-VS-resources-pri-path' into releaseBrad King2016-10-051-2/+4
|\ \ \ \
| * | | | VS: Use absolute target-specific directory for `resources.pri`Roman Wüger2016-10-051-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~219^2 (VS: Use target-specific directory for `resources.pri`, 2016-08-25) incorrectly specifies a relative path for the `ProjectPriFullPath` value. Fix it to use an absolute path. Issue: #16106
* | | | Merge branch 'qtifw-https-cmake.org' into releaseBrad King2016-10-041-1/+1
|\ \ \ \
| * | | | QtIFW: Reference cmake.org via https in cmake.org.htmlBrad King2016-10-041-1/+1
| |/ / /
* | | | Merge branch 'cmake-server-improve-shutdown' into releaseBrad King2016-10-043-53/+132
|\ \ \ \ | |_|/ / |/| | |
| * | | server-mode: Improve shutdown behaviorTobias Hunger2016-10-043-53/+132
| |/ / | | | | | | | | | | | | | | | Add a signal handler to trigger shutdown and be more paranoid about libuv doing things asynchronously. This should fix test cases not shutting down properly.
* | | Merge branch 'fix-doc-3.7-relnotes' into releasev3.7.0-rc1Brad King2016-10-031-0/+4
|\ \ \
| * | | Help: Add 3.7 release note for CPack/NSISRoman Wüger2016-10-031-0/+4
| |/ /
* | | CMake 3.7.0-rc1 version updateBrad King2016-10-032-4/+4
| | |
* | | Help: Drop development topic notes to prepare releaseBrad King2016-10-032-9/+0
|/ / | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | Merge topic 'doc-3.7-relnotes'Brad King2016-10-0364-390/+310
|\ \ | | | | | | | | | | | | | | | 64e63da0 Help: Organize and revise 3.7 release notes e82c33b8 Help: Consolidate 3.7 release notes
| * | Help: Organize and revise 3.7 release notesBrad King2016-10-011-164/+199
| | | | | | | | | | | | | | | Add section headers similar to the 3.6 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | Help: Consolidate 3.7 release notesBrad King2016-10-0164-390/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.7.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand.
* | | Merge topic 'FindBoost-1.62'Brad King2016-10-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | a997cac8 FindBoost: Add 1.62 and 1.62.0 as supported versions
| * | | FindBoost: Add 1.62 and 1.62.0 as supported versionsRoger Leigh2016-10-031-1/+1
| | | |
* | | | Merge topic 'doc-target_link_libraries-flags'Brad King2016-10-031-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 07bb2724 Help: Clarify treatment of link flags in target_link_libraries
| * | | | Help: Clarify treatment of link flags in target_link_librariesJohn Beard2016-10-031-0/+6
| | | | |
* | | | | Merge topic 'cmake-server-teardown-file-monitor'Brad King2016-10-031-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | 1b43f9d1 cmake-server: Stop the file monitor on client disconnect
| * | | | cmake-server: Stop the file monitor on client disconnectBrad King2016-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the client disconnects we need to remove all events from our loop. Prior to the introduction of the file monitor we only needed to remove the client pipes. Now we need to remove the file monitor events too. Without this the event loop may continue to block on file monitor events. If one does eventually come in then the event handler may try to report it to the disconnected client and crash because our internal structures for writing to the client have been freed. This addresses a failure of the `Server` test on some machines.
* | | | | CMake Nightly Date StampKitware Robot2016-10-031-1/+1
| | | | |
generated by cgit v0.12 at 2024-11-11 18:22:05 (GMT)