summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Android: Fix support for armeabi with c++_staticBrad King2016-10-212-5/+2
| | | | | | | | Add missing "unwind" and "atomic" libraries needed for this combination. See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the libraries the NDK uses. Issue: #16380
* Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-183-2/+5
|\
| * Tests: Add VSNsightTegra test for VS 2015Brad King2016-10-181-0/+3
| |
| * Tests: Fix VSNsightTegra test on Android NDK r12bBrad King2016-10-181-1/+1
| | | | | | | | | | Test with architecture `armv7-a` instead of `armv7-a-hard` because the latter is supporte supported only with NDK revisions r9c to r11c.
| * VS: Fix NVIDIA Nsight Tegra Visual Studio Edition supportBrad King2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The guard added by commit v3.7.0-rc1~229^2~17 (Android: Suppress new functionality with Nsight Tegra in VS IDE builds, 2016-06-02) to `Modules/Platform/Android-Determine.cmake` does not work in that location because `CMAKE_VS_PLATFORM_NAME` is not set until after the module is loaded. Change this particular guard to test for the Visual Studio generator instead. If in the future we add support for using Visual Studio for Android without Nsight Tegra then something more will be needed, but this is good enough for now. Closes: #16371
* | Merge branch 'cmake-server-pipe-mode-fix' into releaseBrad King2016-10-181-6/+5
|\ \
| * | server-mode: Fix named pipe modeTobias Hunger2016-10-181-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Do not treat a pointer itself as a `uv_stream_t`, but instead the pointed-to `uv_pipe_t`. It is unclear how this ever worked before in local testing. While at it, remove duplicate setup code and improve an error message.
* | | Merge branch 'external-project-source-subdir-usage' into releaseBrad King2016-10-181-8/+9
|\ \ \
| * | | ExternalProject: make SOURCE_SUBDIR directly appendableBen Boeckel2016-10-181-6/+6
| | | | | | | | | | | | | | | | | | | | This allows it to be used in expansions without being conditional based on its value.
| * | | ExternalProject: error out only if the property is unsetBen Boeckel2016-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | Property values may be empty; instead make sure they exist and allow for empty values.
* | | | Merge branch 'FindwxWidgets-unversioned-library-path' into releaseBrad King2016-10-171-12/+22
|\ \ \ \
| * | | | FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~217^2 (FindwxWidgets: Add VS-versioned library directory prefixes, 2016-08-24) works only for official wxWidgets builds that add the VS-versioned directory prefixes. Local wxWidgets builds still have an unversioned prefix. Search them. Closes: #16366
* | | | Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
|\ \ \ \
| * | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK version to host version, 2015-10-11) does not make sense when cross-compiling. Make it conditional to fix this regression in some cross-compiling cases. Closes: #16355
* | | | Merge branch 'doc-math-EXPR' into releaseBrad King2016-10-141-4/+5
|\ \ \ \
| * | | | Help: Fix math(EXPR) documentation formattingBrad King2016-10-141-4/+5
| |/ / /
* | | | Merge branch 'doc-clarify-ctest-APPEND' into releaseBrad King2016-10-144-4/+12
|\ \ \ \
| * | | | Help: Clarify `ctest_*` APPEND option behaviorBrad King2016-10-144-4/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | Explicitly state that this marks the `.xml` to tell the dashboard server to append it to previously submitted results and that it does not cause results to be appended to the `.xml` file.
* | | | Merge branch 'ninja-framework-POST_BUILD' into releaseBrad King2016-10-132-2/+9
|\ \ \ \
| * | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-132-2/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition added by commit v2.8.12~179^2 (OS X: Fix regression handling frameworks for Ninja, 2013-07-16) for excluding use of versioning symlinks on macOS Frameworks must match that used for POST_BUILD selection. Otherwise we place the POST_BUILD commands after a symlink step that is never added. Closes: #16363
* | | | Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into releaseBrad King2016-10-133-6/+6
|\ \ \ \
| * | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
* | | | Merge branch 'ninja-rc-regression' into releaseBrad King2016-10-131-1/+1
|\ \ \ \
| * | | | Ninja: Fix RC language depfile generation with cmcldepsBen Boeckel2016-10-131-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files, 2016-08-05), the source path was changed to use an absolute path. Inside of `cmcldeps` for `.rc` file compilation, it uses a separate argument for the path to the source file. This ended up causing `cmcldeps` to transform the following call: cmcldeps.exe RC source.rc ... C:/full/path/to/source.rc into: ... C:/full/path/to//Tc source.rc which is invalid. Update the source filename to use the full path to the source file so that the path is replaced properly.
* | | | Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
|\ \ \ \
| * | | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| |/ / /
* | | | Merge branch 'cmake-gui-fix-extra-generator-names' into releaseBrad King2016-10-111-1/+1
|\ \ \ \
| * | | | cmake-gui: Fix "extra" generator entries in drop-down listBrad King2016-10-111-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.7.0-rc1~291^2~1 (Refactor extra generator registration to use factories, 2016-07-20) accidentally switched the order of the "extra - base" generator names to "base - extra". Switch it back. While this could affect all callers of the `GetRegisteredGenerators` method, only cmake-gui actually used this particular field. Closes: #16359
* | | | 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.
generated by cgit v0.12 at 2024-11-14 19:55:58 (GMT)