summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'use-emplace'Brad King2019-01-2158-271/+271
|\ | | | | | | | | | | | | | | ef61997b1b clang-tidy: Use emplace 2e5307a2a4 CTestSVN: Accept std::string in SVNInfo constructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2811
| * clang-tidy: Use emplaceRegina Pfeifer2019-01-1757-269/+269
| |
| * CTestSVN: Accept std::string in SVNInfo constructorBrad King2019-01-172-2/+2
| |
* | Merge topic 'ctest-json-polish'Brad King2019-01-219-11/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cae9d2a61a CTest: Teach --show-only= to reject unknown values 7370b02c36 CTest: Teach --show-only=json-v1 to filter out not-available tests 62fec84ad7 Tests: Fix RunCMake.CTestCommandLine case when no python is found 75a7a23746 Tests: Rename RunCMake.CTestCommandLine show-only test cases fecbc87608 Tests: Fix RunCMake.CTestCommandLine to actually check json-v1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2812
| * | CTest: Teach --show-only= to reject unknown valuesBrad King2019-01-175-0/+8
| | |
| * | CTest: Teach --show-only=json-v1 to filter out not-available testsBrad King2019-01-172-0/+6
| | | | | | | | | | | | | | | | | | Avoid exposing the internal special value that we use to track tests not available in the tested configuration. This also prevents clients from having to do the filtering themselves.
| * | Tests: Fix RunCMake.CTestCommandLine case when no python is foundBrad King2019-01-171-0/+3
| | | | | | | | | | | | | | | Do not try to run the python checks if the python executable is not available.
| * | Tests: Rename RunCMake.CTestCommandLine show-only test casesBrad King2019-01-175-12/+12
| | | | | | | | | | | | | | | The current name was chosen from an earlier design iteration of the command-line option name. Rename the case to match the final name.
| * | Tests: Fix RunCMake.CTestCommandLine to actually check json-v1Brad King2019-01-161-0/+1
| | | | | | | | | | | | | | | Add a file missing from commit 67209a9291 (Tests: Add cases for ctest --show-only=json-v1, 2018-11-01) to actually hook up the content check.
* | | Merge topic 'FindCURL-typo'Brad King2019-01-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0526ae4415 FindCURL: fix component failure when no pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2826
| * | | FindCURL: fix component failure when no pkg-configHiroshi Miura2019-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_package(CURL COMPONENTS foo) fails when there is no pkg-config module because of variable name typo. Signed-off-by: Hiroshi Miura <miurahr@linux.com> Fixes: #18802
* | | | Merge topic 'command_file_link'Brad King2019-01-2115-3/+226
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f08ed8936 cmSystemTools: Silence CreateLink and CreateSymlink errors 593d986470 Tests: Avoid cross-device links in CREATE_LINK test 9a3d85cfc5 Tests: Skip symlink tests on Windows e68ea269d7 Tests: CREATE_LINK subcommand negative test case 45aa9c65a1 Tests: file CREATE_LINK subcommand test cases 8bb7562f1a Help: Add documentation for file(CREATE_LINK) subcommand 81650e488c cmFileCommand: Add CREATE_LINK subcommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2759
| * | | | cmSystemTools: Silence CreateLink and CreateSymlink errorsTushar Maheshwari2019-01-163-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | If provided, report errors to a std::string. This allows "silent" fallback to another flow, like COPY_ON_ERROR.
| * | | | Tests: Avoid cross-device links in CREATE_LINK testTushar Maheshwari2019-01-163-1/+20
| | | | | | | | | | | | | | | | | | | | Add a test for COPY_ON_ERROR to cover that scenario.
| * | | | Tests: Skip symlink tests on WindowsTushar Maheshwari2019-01-165-10/+10
| | | | |
| * | | | Tests: CREATE_LINK subcommand negative test caseTushar Maheshwari2019-01-164-0/+7
| | | | |
| * | | | Tests: file CREATE_LINK subcommand test casesTushar Maheshwari2019-01-164-0/+21
| | | | |
| * | | | Help: Add documentation for file(CREATE_LINK) subcommandTushar Maheshwari2019-01-161-0/+23
| | | | |
| * | | | cmFileCommand: Add CREATE_LINK subcommandTushar Maheshwari2019-01-164-0/+143
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the functionality of `cmake -E create_symlink` and more to scripts. The default behavior is to create hard links. The `SYMBOLIC` argument can be used to create symlinks instead. The `COPY_ON_ERROR` argument enables a fallback to copying the file in case the link fails. The `RESULT <var>` retrieves the error message generated by the system. It is set to "0" on success. Fixes: #16926
* | | | Merge topic 'find-package-resolve-symlinks'Brad King2019-01-2112-0/+96
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b773e58099 find_package: add test coverage for CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS a5e948a36f find_package: optionally resolve symlinks when discovering packages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2798
| * | | | find_package: add test coverage for CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKSDavid Aguilar2019-01-166-0/+63
| | | | |
| * | | | find_package: optionally resolve symlinks when discovering packagesDavid Aguilar2019-01-166-0/+33
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach find_package() to resolve symlinks when constructing relocatable prefix paths from discovered cmake config files. The `CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS` variable enables this behavior when set to `TRUE`. Fixes: #18704
* | | | Merge topic 'submit-url'Brad King2019-01-2115-143/+145
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2915a75615 CTest: Add documentation and release notes for SubmitURL d6475daa79 Modules/CTest: Set SubmitURL 938f06fda6 ctest_submit: Add parameter SUBMIT_URL 65e725c957 CTest: Add option SubmitURL 65f1fc9d63 CTest: Add function GetSubmitURL 2bedd5fb7c ctest_submit: Remove submit method from log output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2719
| * | | | CTest: Add documentation and release notes for SubmitURLRegina Pfeifer2019-01-166-14/+45
| | | | |
| * | | | Modules/CTest: Set SubmitURLRegina Pfeifer2019-01-162-6/+14
| | | | |
| * | | | ctest_submit: Add parameter SUBMIT_URLRegina Pfeifer2019-01-162-1/+16
| | | | |
| * | | | CTest: Add option SubmitURLRegina Pfeifer2019-01-162-27/+17
| | | | | | | | | | | | | | | | | | | | Fixes: #18610
| * | | | CTest: Add function GetSubmitURLRegina Pfeifer2019-01-164-39/+30
| | | | |
| * | | | ctest_submit: Remove submit method from log outputRegina Pfeifer2019-01-163-70/+37
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2019-01-211-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-01-201-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-01-191-1/+1
| |/ / |/| |
* | | Merge topic 'automoc-test-in-place'Brad King2019-01-181-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1c08652580 Tests: Fix Qt4And5Automoc tests to work on in-source build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2817
| * | | Tests: Fix Qt4And5Automoc tests to work on in-source buildBrad King2019-01-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a distinctly-named build directory for each case so that neither one uses its own source tree as the build tree. Fixes: #18159
* | | | Merge topic 'GHS_updates'Brad King2019-01-18148-1046/+2084
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21ab58d3f8 GHS: Update test suite 72e0c115b7 GHS: Add Compiler ID detection 436cc5e991 GHS: try_compile() now uses GHS platform variables 4a1ec0de3d GHS: Fix toolset selection 1a66acdef2 GHS: Append ".gpj" to target name when generating build command 0c9e47d7cd GHS: Integrity Application updates 8044318431 GHS: Add support for some of the source file properties 73092b2213 GHS: Add support for object libraries ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2231
| * | | | GHS: Update test suiteFred Baksik2019-01-1620-104/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Allow for testing default toolset settings If CMake_TEST_GreenHillsMULTI_config is not defined then just run the GHS tests using defaults. -- Handle paths that contain spaces -- Update test suite to use "-non_shared" linker option Fixes linking issue if GHS is not shipped with shared libraries -- Other minor cleanup
| * | | | GHS: Add Compiler ID detectionFred Baksik2019-01-1617-43/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Detect GHS compiler and version Detect ARCHITECTURE_ID for PPC / ARM / 86 targets Detect PLATFORM_ID for Integrity and Integrity178 platforms Using defines specified in the documents for the compilers: 201416 PPC / 201754 ARM / 201714 86 -- Fallback C/CXX compiler ID to GHS if not otherwise detected and using GHS MULTI generator Works around issue with some GHS compilers not setting __ghs__ compiler define -- Tweak Compiler ID checking so major id of 002017 is not replaced with 217 -- Prefer try_compile() library targets when testing for working GHS compilers -- Avoid CMake errors if reading past end of file for checking if file is PE executable
| * | | | GHS: try_compile() now uses GHS platform variablesFred Baksik2019-01-169-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Forward GHS platform variables to try_compile() CMAKE_TRY_COMPILE_PLATFORM_VARIABLES only worked for source signature try_compile() -- Update tests to no longer add GHS platform variables to try_compile() -- Avoid linker error in GhsMulti/GhsMultiCompilerOptions/CMakeLists.txt by building library
| * | | | GHS: Fix toolset selectionFred Baksik2019-01-163-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Allow -T to accept full or partial paths -- Use "C:/ghs" if GHS_TOOLSET_ROOT is empty string -- Put more information in error messages
| * | | | GHS: Append ".gpj" to target name when generating build commandFred Baksik2019-01-164-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Add test demonstrating issue -- In the case of executable targets the target name is usually the same as used in "-o filename" But for static libraries the target name is usually "-o libname.a" "gbuild.exe target" will build whatever target matches against even the output from the compiler or linker But the targets in "cmake --build . --target name" should be target names in CMakeLists.txt not the actual filenames So change the "name" to "name.gpj" so it matches the target name in CMakeLists.txt. Fixes #15975
| * | | | GHS: Integrity Application updatesFred Baksik2019-01-1614-62/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Check the property "ghs_integrity_app" on executables to set [INTEGRITY Application] If the property is not set then check if an integrate file is one of the source files (.int file). Dynamic Downloads that do not have an integrate file can use this property along with setting the compiler flag "-dynamic". -- Remove parsing for -dynamic flag; it is only used to print a comment The MULTI GUI will show if it is a Monolith or Dynamic Download application -- Use project references to specify which executables are part of the Integrity Application Usually Implicit Dependency Analysis will ensure that executable targets become part of the application. This does not work for Dynamic Download without integrate files. Use `add_dependencies(dd vas)` to mark that the vas target is part of dd target. -- Update file locations in the Integrate files.
| * | | | GHS: Add support for some of the source file propertiesFred Baksik2019-01-162-1/+22
| | | | | | | | | | | | | | | | | | | | -- INCLUDE_DIRECTORIES, COMPILE_DEFINITIONS, and COMPILE_OPTIONS
| * | | | GHS: Add support for object librariesFred Baksik2019-01-164-96/+70
| | | | |
| * | | | GHS: EXCLUDE_FROM_ALL updatesFred Baksik2019-01-164-70/+33
| | | | | | | | | | | | | | | | | | | | | | | | | -- Excluded targets should be generated but not included in build ALL -- Use the correct source list for this configuration when writing sources
| * | | | GHS: Use the correct compiler flags for CMAKE_BUILD_TYPEFred Baksik2019-01-1610-120/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Do not use CMAKE_C_FLAGS_RELEASE flags when CMAKE_BUILD_TYPE is empty if CMAKE_BUILD_TYPE was not set the generator would use Release settings this does not match the documented behavior of CMAKE_BUILD_TYPE -- CMAKE_C_FLAGS_<CONFIG> not used when -kernel is present Fixes issue where CMAKE_C_FLAGS_<CONFIG> is ignored when -kernel option is present as a compiler option When the -kernel option is added to an executable it uses a different set of language flags This does not occur -kernel=<type> is used or if it is added as part of a link flag The variables CMAKE_<LANG>_GHS_KERNEL_FLAGS_<CONFIG> are removed NOTE: By default this only added the flag -ldebug which links in the debugger library. -- Separate compiler options by newlines
| * | | | GHS: Cleanup unused file handling functions and file output updatesFred Baksik2019-01-166-365/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- File handling cleanup -- Rename some functions to clarify what they do -- Update to source file path conversion; only perform conversion when using windows
| * | | | GHS: Update the link line processingFred Baksik2019-01-163-56/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- add missing executable linker libs from: CMAKE_C_STANDARD_LIBRARIES -- add missed transitive link libraries -- add skipped library linker options -- The linker expects -l../relative/path/to/lib.a to be relative to the top-level project Because there can be multiple top-level projects convert the path to an absolute path to target
| * | | | GHS: Place build system outputs per target output directivesFred Baksik2019-01-168-46/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Set output and object file locations -- Suffixes are no longer being forced but will now follow the target properties By default GHS tools have no suffix for executable files so CMAKE_EXECUTABLE_SUFFIX was changed to meet this behavior -- Remove #if 0 blocked out code; it has been replaced. Forcing the -relprog option has been removed from non-kernel executable targets. The default value of this option (if it is even available) is determined by the tool-chain for the specified target and platform (Some tool-chains default to -locatedprogram). The use of -relprog can have unexpected results as it cannot always produce a fully relocated executable. -- Clarify use of CMAKE_BUILD_TYPE to control build configuration
| * | | | GHS: Update the top-level project generationFred Baksik2019-01-166-106/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Sort targets by name -- Generate a top-level project for each project command named as project.top.gpj Use the target set for the current project instead of assuming all targets -- Add support for building projects not in binary root -- Directly create files and pass ostream -- Do no generate project files for UTILITY targets; this was never supported -- Do no generate project files for OBJECT, SHARED, or MODULE libraries; this was never supported -- Update GHS tags to support project types NOTE: The default tag is changed to "" because "[ ]" is an invalid token in project file
| * | | | GHS: Cleanup how source files are listedFred Baksik2019-01-164-48/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Sort the items of the project files, previously they were unsorted The layout is similar to Visual Studio projects -- Do not make a make a tree of directories and projects files The main project file is in the binary folder The sub-project files are located in the project object directory This is similar to the Makefile generator -- Allow the creation of a single project file If the variable or target property GHS_NO_SOURCE_GROUP_FILE is set then all sources will be listed in the main project file