summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CTest: Add version field to resource spec fileKyle Edwards2019-11-2537-0/+224
| | | | Fixes: #20007
* Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16Brad King2019-11-251-1/+1
|\ | | | | | | | | | | | | a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4079
| * FindwxWidgets: Fix finding both release and debug libsBrad King2019-11-221-1/+1
| | | | | | | | | | | | | | | | In commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) the internal `WX_FIND_LIBS` macro gained an argument but not all call sites were updated. Update the missing one now. Fixes: #20005
* | Merge topic 'xcode-objc' into release-3.16Brad King2019-11-211-0/+4
|\ \ | | | | | | | | | | | | | | | | | | 1e68fb0c91 Xcode: Set source file type for Objective C/C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4073
| * | Xcode: Set source file type for Objective C/C++Brad King2019-11-201-0/+4
| | | | | | | | | | | | Fixes: #19998
* | | Merge topic 'FindwxWidgets-qt-debug' into release-3.16Brad King2019-11-211-0/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | 84408ff402 FindwxWidgets: Find wxQt debug libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4069
| * FindwxWidgets: Find wxQt debug librariesCraig Sturdy2019-11-201-0/+2
|/ | | | | Extend the change from commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) to also find debug-enabled libs.
* CMake 3.16.0-rc4v3.16.0-rc4Brad King2019-11-181-1/+1
|
* Merge topic 'swift-rpath-darwin' into release-3.16Brad King2019-11-181-1/+1
|\ | | | | | | | | | | | | ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4059
| * Swift: support `-rpath` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | Darwin also has the concept of RPATH. Additionally, the flag is identical to that on other Unixish platforms. Simply avoid the `-rpath` handling on Windows. This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH` with Swift targets on Darwin.
* | Merge topic 'swift-darwin-install-name' into release-3.16Brad King2019-11-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4060
| * | Swift: support `INSTALL_NAME_DIR` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Adjust the shared object rule to ensure that we honour the `INSTALL_NAME_DIR` property on Swift targets. This enables the use of `INSTALL_NAME_DIR` and `BUILD_WITH_INSTALL_NAME_DIR` on Darwin with Ninja.
* | | Merge topic 'compile-features-other-lang' into release-3.16Brad King2019-11-181-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4057
| * | | Help: Clarify compile features handling for OBJC and OBJCXXCraig Scott2019-11-171-1/+6
| | | |
* | | | Merge topic 'cpack-custom-templates' into release-3.16Brad King2019-11-186-9/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6ab5dc5b CPack: Restore support for custom package configuration templates Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4054
| * | | | CPack: Restore support for custom package configuration templatesBrad King2019-11-156-9/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to `Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally changed the public-facing names of the templates. The name passed to `FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change. Remove the `Internal/CPack/` prefix on the names added by that commit. Teach `FindTemplate` to use our builtin default directly when the public-facing name is not found in `CMAKE_MODULE_PATH`. Fixes: #19979
* | | | Merge topic 'docs-pch-reorg' into release-3.16Brad King2019-11-182-49/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers() dae9a808fe Help: Reorganise target_precompile_headers() docs for readability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4045
| * | | | Help: Provide guidance on INTERFACE for target_precompile_headers()Craig Scott2019-11-132-0/+16
| | | | | | | | | | | | | | | | | | | | Fixes: #19953
| * | | | Help: Reorganise target_precompile_headers() docs for readabilityCraig Scott2019-11-131-49/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporates clarification of behavior when trying to specify REUSE_FROM on a target that already has its own precompile headers set. Fixes: #19970
* | | | | Merge topic 'pch-reuse-no-prop' into release-3.16Brad King2019-11-184-11/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4046
| * | | | | PCH: Do not issue an error on duplicate target_precompile_headers callCristian Adam2019-11-154-11/+22
| |/ / / / | | | | | | | | | | | | | | | Fixes: #19970
* | | | | Merge topic 'tutorial-replace-unicode-dash' into release-3.16Craig Scott2019-11-181-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4058
| * | | | Tutorial: replace Unicode EN DASH with ASCII dashArkadiusz Drabczyk2019-11-171-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Unicode EN DASH is problematic: - it cannot be easily found in web browsers, editors etc. - it doesn't work when copied and run in the terminal
* | | | Merge topic 'objc-standard-fix' into release-3.16Brad King2019-11-151-14/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4050
| * | | | ObjC: Proper initialization of ObjC/XX standard propertiesCristian Adam2019-11-141-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 81566557d5 (ObjC: Initialize ObjC/XX standard properties from C/C++ counterparts, 2019-11-09) to account for cases when the CXX standard is not explicitly set. Also, do not copy the `*_STANDARD_REQUIRED` and `*_EXTENSIONS` properties unless we copied the `*_STANDARD` property.
* | | | | Merge topic 'objc-tests' into release-3.16Brad King2019-11-1523-87/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2e5e6ff1a Tests: Organize Objective C/C++ test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4051
| * | | | | Tests: Organize Objective C/C++ test directoriesBrad King2019-11-1423-87/+10
| | | | | | | | | | | | | | | | | | | | | | | | Move them all under `Tests/ObjC` and `Tests/ObjCXX`.
* | | | | | Merge topic 'fix-optional-test' into release-3.16Brad King2019-11-151-36/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4049
| * | | | | | Tests: Fix reliance on undefined behavior of cm::optionalKyle Edwards2019-11-131-36/+48
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test for cm::optional assumed that *opt would return a reference to a non-constructed object if opt.has_value() is false. However, on certain systems that build CMake with flags to harden the build, this condition aborts rather than returning the invalid reference. Fix this by getting the reference only when the cm::optional is known to actually have a value. Fixes: #19964
* | | | | | Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16Brad King2019-11-151-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4043
| * | | | | FindPostgreSQL: also search for libraries in the MacPorts suffixBen Boeckel2019-11-131-0/+1
| | |_|/ / | |/| | |
* | | | | Merge topic 'FindwxWidgets-mingw' into release-3.16Brad King2019-11-131-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | c921ec6112 FindwxWidgets: Add link dependencies for MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4040
| * | | | FindwxWidgets: Add link dependencies for MinGWGrant Kim2019-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | wxWidgets on MinGW requires system libraries `uuid` and `uxtheme`.
* | | | | Merge topic 'objc-standard' into release-3.16Brad King2019-11-131-0/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81566557d5 ObjC: Initialize ObjC/XX standard properties from C/C++ counterparts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4022
| * | | | | ObjC: Initialize ObjC/XX standard properties from C/C++ counterpartsCristian Adam2019-11-121-0/+29
| | |_|/ / | |/| | | | | | | | | | | | | Fixes: #19937
* | | | | Merge topic 'FindwxWidgets-qt' into release-3.16Brad King2019-11-131-22/+26
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | fe54989fcd FindwxWidgets: Add support for wxQt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4038
| * | | FindwxWidgets: Add support for wxQtCraig Sturdy2019-11-121-22/+26
| | |/ | |/|
* | | Merge topic 'swift-rpath-separator' into release-3.16Brad King2019-11-131-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | a27a1c7e88 Swift: Allow build and installed RPATHs to differ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4037
| * | Swift: Allow build and installed RPATHs to differSaleem Abdulrasool2019-11-121-0/+1
| |/ | | | | | | | | | | Define the RPATH separator to `:` so that CMake can reserve room to edit the ELF RPATH at install time. This enables the use of `BUILD_RPATH` and `INSTALL_RPATH` with differing values.
* | Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS' into release-3.16Kyle Edwards2019-11-121-1/+2
|\ \ | | | | | | | | | | | | | | | | | | 64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4036
| * | Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTSMarc Aldorasi2019-11-111-1/+2
| | |
* | | Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16Brad King2019-11-129-9/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4023
| * | | Unity: Don't include sources with HEADER_FILE_ONLY property setCristian Adam2019-11-119-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19946 Fixes: #19947 Co-authored-by: Craig Scott <craig.scott@crascit.com>
* | | | Merge topic 'objc-standard-docs' into release-3.16Brad King2019-11-1215-1/+238
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4031
| * | | | ObjC: Document ObjC/ObjCXX standard properties / variablesCristian Adam2019-11-1115-1/+238
| | | | | | | | | | | | | | | | | | | | Fixes: #19919
* | | | | Merge topic 'objc-xcode-flags' into release-3.16Brad King2019-11-126-8/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4020
| * | | | | ObjC: Add OBJC/OBJCXX flags to Xcode projectsCristian Adam2019-11-116-8/+61
| | |_|/ / | |/| | | | | | | | | | | | | Fixes: #19936
* | | | | Merge topic 'update-expat' into release-3.16Brad King2019-11-1224-4843/+4037
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50bc359184 expat: Update CMake build for 2.2.9 b63a5c88a2 Merge branch 'upstream-expat' into update-expat 1712885b4f expat 2019-09-25 (a7bc26b6) 512fabaa9d expat: Update script to get Expat 2.2.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4032
| * | | | | expat: Update CMake build for 2.2.9Brad King2019-11-111-1/+0
| | | | | |
| * | | | | Merge branch 'upstream-expat' into update-expatBrad King2019-11-1122-4840/+4036
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2019-09-25 (a7bc26b6)