summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Haiku: Remove use of B_COMMON_DIRECTORYAdrien Destugues2013-10-084-23/+32
| | | | | | | The common directory was removed in Haiku. Applications are now installed in the system directory. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* Haiku: Several fixes to platform moduleAdrien Destugues2013-10-084-16/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not define BEOS anymore (this includes workarounds which we don't need most of the time in Haiku, so we prefer opt-in IF(HAIKU) in the cmake files instead). * On the other hand, do define UNIX (we are trying to be compliant) and HAIKU (there is still a number of things we don't do like the average UNIX clone) * Do not use UnixPaths, as our filesystem hierarchy isn't anything like what it expects. * Do not use -nostart, which the compiler doesn't know about anymore. This used to be an Haiku extension to gcc, and is equivalent to -shared which is the default gcc option. * While "dl" functions are provided in libroot, this is always implicitly linked so there is no need to tell cmake about it. * Forcing position-independent code is not needed, so remove it. * On the other hand, include appropriate linker options for executables and shared libraries. * Support for the two available compilers in Haiku (gcc2 and gcc4) and pick the right headers and libraries according to the currently selected one. * With the adoption of the package manager, the directory layout was changed. Tell cmake where to look for header files and libraries. * As we don't define BEOS anymore, enable the workaround we still need for HAIKU as well. This is the lack of a libm (it is part of the implicitly linked in libroot) Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-10-083-13/+5
|\
| * KWSys 2013-10-08 (96b2f6f4)KWSys Robot2013-10-083-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 96b2f6f4 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' deec6b8a..96b2f6f4 Adrien Destugues (2): 2b303bd7 SystemTools: Remove outdated preprocessor checks for Haiku 96b2f6f4 DynamicLoader: Cleanup test include files for Haiku Rolf Eike Beer (1): dbc8fa1b SystemInformation: fix truncation warnings Change-Id: I25364f58d62dd73fde0f7625d9d77ed0d4726e33
* | Merge topic 'CheckStructHasMember_CXX'Brad King2013-10-0824-9/+219
|\ \ | | | | | | | | | | | | 73d28d2 CheckStructHasMember: Add support for C++
| * | CheckStructHasMember: Add support for C++Daniele E. Domenichelli2013-10-0824-9/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if headers required to check if a struct has a member can be compiled with C++ compiler only, the check would fail because the C compiler fails. As a consequence, the result variable would be set to false, even if the struct has that particular member. Teach CHECK_STRUCT_HAS_MEMBER to accept a new optional argument LANGUAGE that allows one to explicitly set the compiler to use. The new signature is therefore: CHECK_STRUCT_HAS_MEMBER (<struct> <member> <header> <variable> [LANGUAGE <language>])
* | | Merge topic 'cxx-flags'Brad King2013-10-083-25/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | 455bad1 Check*CompilerFlag: Add SunStudio 12 regex 6f3ebfe Check*CompilerFlag: make C and CXX modules share most error patterns (#14339)
| * | | Check*CompilerFlag: Add SunStudio 12 regexWilliam Orr2013-10-081-0/+1
| | | | | | | | | | | | | | | | Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | Check*CompilerFlag: make C and CXX modules share most error patterns (#14339)Rolf Eike Beer2013-08-133-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies maintenance as most patterns will be for both modules and may be added at a central place. While at it add error patterns for XL and BCC.
* | | | Merge topic 'Add-coverage.py-Coverage'Brad King2013-10-0810-0/+281
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d0ec3a0 Adding support for the Python coverage.py tool.
| * | | | Adding support for the Python coverage.py tool.Patrick Reynolds2013-10-0810-0/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This assumes that coverage.py has been run in such a way to produce its standard XML output. This uses the Cobertura schema and should be somewhat generalizable.
* | | | | Merge topic 'ctest_rerun_failed'Brad King2013-10-085-2/+172
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eb2decc ctest: Add --rerun-failed option
| * | | | | ctest: Add --rerun-failed optionZack Galbreath2013-10-085-2/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new command line argument to ctest. This allows users to rerun tests that failed during the previous call to ctest. This is accomplished by analyzing the most recently modified file named "^LastTestsFailed*" in the Testing/Temporary subdirectory of the project's binary directory.
* | | | | | Merge topic 'clang-warnings'Brad King2013-10-0814-31/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af0051f curl, bzip2: Suppress warnings by setting initial value cb4ec60 cmDocumentation: Fix a few doxygen comment errors d915819 cm*Lexer: Populate empty doxygen @param comment 97124f9 cmTarget: Properly escape @ char in doxygen comments 8e96353 Fix warnings about \brief usage d993032 cmGraphVizWriter: Add extra space in comment to suppress warning 6cea3ee cmNewLineStyle: Remove useless semi-colon 7e7a1c0 curl: Fix typo in header include guard
| * | | | | | curl, bzip2: Suppress warnings by setting initial valueSean McBride2013-10-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence clang -Wsometimes-uninitialized warnings.
| * | | | | | cmDocumentation: Fix a few doxygen comment errorsSean McBride2013-10-081-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Warned by clang -Wdocumentation
| * | | | | | cm*Lexer: Populate empty doxygen @param commentSean McBride2013-10-084-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And in one case fixed wrong param name. Warned by clang -Wdocumentation.
| * | | | | | cmTarget: Properly escape @ char in doxygen commentsSean McBride2013-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by clang's -Wdocumentation.
| * | | | | | Fix warnings about \brief usageSean McBride2013-10-083-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A doxygen \brief is ended with a newline, so remove a newline right after \brief to fix clang -Wdocumentation warning.
| * | | | | | cmGraphVizWriter: Add extra space in comment to suppress warningSean McBride2013-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang's -Wdocumentation thought it was malformed doxygen.
| * | | | | | cmNewLineStyle: Remove useless semi-colonSean McBride2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Warned by clang.
| * | | | | | curl: Fix typo in header include guardSean McBride2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From clang's -Wheader-guard.
* | | | | | | CMake Nightly Date StampKitware Robot2013-10-081-1/+1
| | | | | | |
* | | | | | | Merge topic 'split-cmake-E'Brad King2013-10-077-1385/+1432
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c04995b cmake: Split -E command implementation into separate source file
| * | | | | | | cmake: Split -E command implementation into separate source fileBrad King2013-10-037-1385/+1432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the cmake::ExecuteCMakeCommand static method and all the static methods it calls out of the 'cmake' class to a separate 'cmcmd' class. Build the latter as part of the main cmake executable with cmakemain.cxx and not in CMakeLib. Drop unused header includes from "cmake.cxx". By moving this implementation out of cmake.cxx we avoid carrying it around in all the executables that use class 'cmake'. It is needed only for the main "cmake -E" functionality.
* | | | | | | | Merge topic 'test-Qt4-quiet'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3170c8 Tests: Make find_package(Qt4) QUIET
| * | | | | | | | Tests: Make find_package(Qt4) QUIETBrad King2013-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lack of Qt4 on a system should silently skip the corresponding tests with no other messages. This is already the case for other find_package calls in Tests/CMakeLists.txt.
* | | | | | | | | Merge topic 'IMPORTED-target-SYSTEM-includes'Brad King2013-10-077-1/+134
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a63fcbc Always consider includes from IMPORTED targets to be SYSTEM.
| * | | | | | | | | Always consider includes from IMPORTED targets to be SYSTEM.Stephen Kelly2013-09-247-1/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a target property to control this behavior variable to set the default value for the target property. This does not affect try_compile runs.
* | | | | | | | | | Merge topic 'private-link-depends-are-package-private'Brad King2013-10-071-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ad2a1c Export: Never treat private link libraries as public package dependencies.
| * | | | | | | | | | Export: Never treat private link libraries as public package dependencies.Stephen Kelly2013-09-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple libraries in a single buildsystem can be exported to multiple export-sets. If a library from one export set depends on a library from another export set, the export logic generates a check in the targets file to verify that the target in the other export set is found. That check is executed at downstream-find_package-time. However, a target may depend privately on a target in another export set. In that case, the depend used to also be listed in the required targets in the targets file. Change the export logic to ignore the private link entries instead.
* | | | | | | | | | | Merge topic 'fixDocumentationComment'Brad King2013-10-071-4/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e507bf2 CPack: Fix clang -Wdocumentation warnings
| * | | | | | | | | | | CPack: Fix clang -Wdocumentation warningsEric NOULARD2013-09-241-4/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'add_cache_options_to_ccmake'Brad King2013-10-074-3/+168
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fadffab ccmake: Teach dialog to support cache STRINGS property
| * | | | | | | | | | | | ccmake: Teach dialog to support cache STRINGS propertyBill Hoffman2013-10-074-3/+168
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to ccmake of cycling through cache options. This uses the STRINGS property of the cache entry. The enter key will cycle forward, and the right and left arrows will go up and down in the list.
* | | | | | | | | | | | Merge topic 'UseJava-jar-manifest'Brad King2013-10-071-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69aff17 UseJava: Add support for the jar 'm' (Manifest) option
| * | | | | | | | | | | | UseJava: Add support for the jar 'm' (Manifest) optionSimon Levermann2013-09-231-3/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'deprecation-macro-refactor'Brad King2013-10-071-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdf55d5 GEH: Make each element of the deprecation macros overridable. 80d5090 GEH: Use the macro for the deprecation attribute after definiting it.
| * | | | | | | | | | | | | GEH: Make each element of the deprecation macros overridable.Stephen Kelly2013-09-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, we can override only FOO_DEPRECATED to silence deprecation for a library.
| * | | | | | | | | | | | | GEH: Use the macro for the deprecation attribute after definiting it.Stephen Kelly2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, it is more-easily overridden.
* | | | | | | | | | | | | | Merge topic 'generate-modern-style'Brad King2013-10-0715-135/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 027a020 Merge branch 'test-property-genex' into generate-modern-style 33055c4 Generate modern-style cmake code.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'test-property-genex' into generate-modern-styleBrad King2013-09-207-25/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Source/cmTestGenerator.cxx by taking "their" side (test-property-genex). It already accounts for the lower-case change in "our" side (generate-modern-style).
| * | | | | | | | | | | | | | | Generate modern-style cmake code.Stephen Kelly2013-08-2215-136/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commits 9db31162 (Remove CMake-language block-end command arguments, 2012-08-13) and 77543bde (Convert CMake-language commands to lower case, 2012-08-13) changed most cmake code to use lowercase commands and no parameters in termination commands. However, those changes excluded cmake code generated in c++ by cmake. Make a similar style change to code generated by cmake.
* | | | | | | | | | | | | | | | Merge topic 'test-property-genex'Brad King2013-10-077-25/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a47c37 add_test: Mention generator expressions in old-style add_test docs d331292 cmTestGenerator: Evaluate generator expressions in test properties 6fe5c4a cmTestGenerator: Separate test properties for each configuration
| * | | | | | | | | | | | | | | add_test: Mention generator expressions in old-style add_test docsBen Boeckel2013-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old-style add_test() call does not support generator expressions at all. This also applies to the properties for the test, but it is not mentioned at all.
| * | | | | | | | | | | | | | | cmTestGenerator: Evaluate generator expressions in test propertiesBen Boeckel2013-09-206-3/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for cases like: add_test(NAME mytest COMMAND mydriver $<TARGET_FILE:myexe>) set_tests_properties(mytest PROPERTIES REQUIRED_FILES "$<TARGET_FILE:myexe>" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>" ) In this example we require the actual test executable to exist to run the test in addition to the test driver at argv[0]. Also the $<CONFIGURATION> expression improves over \${CTEST_CONFIGURATION_TYPE} because the latter is not normalized for case-sensitive filesystems.
| * | | | | | | | | | | | | | | cmTestGenerator: Separate test properties for each configurationBrad King2013-09-201-22/+33
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move property generation from GenerateScriptConfigs to separate copies in GenerateOldStyle and GenerateScriptForConfig. This causes the per-config tests generated for the add_test(NAME) signature to each get their own test properties. This will allow us to later change the property values based on the test configuration. While at it, generate lower-case CMake code (e.g. set_tests_properties). Inspired-by: Ben Boeckel <mathstuf@gmail.com>
* | | | | | | | | | | | | | | Merge topic 'doc-add_dependencies-direction'Brad King2013-10-071-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bdac7d add_dependencies: Clarify direction of dependency in docs (#14424)
| * | | | | | | | | | | | | | | add_dependencies: Clarify direction of dependency in docs (#14424)Brad King2013-09-191-6/+6
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State explicitly that the dependencies will build before the target. Drop wording that may imply the opposite. Suggested-by: Rob Stewart <robert.stewart@sig.com>
* | | | | | | | | | | | | | | Merge topic 'EclipseFixWarningMessage'Brad King2013-10-071-19/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f11b8d Eclipse: add version 4.3 for completeness 2b63734 Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already set 1ff8c21 CMakeFindEclipse: use lowercase for macro calls