summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'VISIBILITY_PRESET-property'Brad King2013-06-0524-0/+228
|\ | | | | | | | | | | cd1fa53 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property. 0e9f4bc Introduce target property <LANG>_VISIBILITY_PRESET
| * Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property.Stephen Kelly2013-06-025-20/+75
| | | | | | | | | | | | | | This corresponds to the g++ and clang++ option -fvisibility-inlines-hidden on linux. On Windows with MinGW, this corresponds to -fno-keep-inline-dllexport. That option is not supported by clang currently.
| * Introduce target property <LANG>_VISIBILITY_PRESETStephen Kelly2013-06-0222-0/+173
| | | | | | | | | | | | This is initialized by CMAKE_<LANG>_VISIBILITY_PRESET. The target property is used as the operand to the -fvisibility= compile option with GNU compilers and clang.
* | CMake Nightly Date StampKitware Robot2013-06-051-1/+1
| |
* | Merge topic 'fix-variable_watch-cases'Brad King2013-06-049-18/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | 647745b variable_watch: Print accesses as "CMake Debug Log" messages 515f9af variable_watch: Remove leftover debugging code (#14187) c63d300 variable_watch: Add test for MODIFIED_ACCESS report 3d5bb38 variable_watch: Add missing string enumeration entry (#14188)
| * | variable_watch: Print accesses as "CMake Debug Log" messagesBrad King2013-06-033-11/+11
| | | | | | | | | | | | | | | | | | Use makefile->IssueMessage() to print the unprocessed watch message in a format consistent with other CMake messages and with a more complete call stack for the access.
| * | variable_watch: Remove leftover debugging code (#14187)Brad King2013-06-034-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a watch does not specify a command to call then variable_watch prints out a message to stderr. Remove code after that which collects all variable values to construct a message that is never printed. Otherwise such code causes a READ_ACCESS watch to trigger on all variables in the currents scope. Reported-by: Yichao Yu <yyc1992@gmail.com>
| * | variable_watch: Add test for MODIFIED_ACCESS reportBrad King2013-06-035-0/+13
| | | | | | | | | | | | Add a RunCMake.variable_watch watch test to cover the basic use case.
| * | variable_watch: Add missing string enumeration entry (#14188)Yichao Yu2013-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | In commit 9a5b4eba (All variable accesses should produce watch callbacks, 2007-05-17) we added a new enumeration value but did not update the list of strings matching them. Add the missing entry. Without this, variable_watch prints REMOVED_ACCESS instead of MODIFIED_ACCESS when set the value of the variable.
* | | Merge topic 'update-kwsys'Brad King2013-06-044-13/+85
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9d38db5 bootstrap: Compile KWSys SystemTools with UTIME(S|NSAT) values 884e3ed Merge branch 'upstream-kwsys' into update-kwsys d66f6f3 KWSys 2013-05-31 (dccf7725)
| * | | bootstrap: Compile KWSys SystemTools with UTIME(S|NSAT) valuesBrad King2013-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit merged a change to KWSys that adds preprocessor definitions for KWSYS_CXX_HAS_UTIMENSAT and KWSYS_CXX_HAS_UTIMES to the command line for compiling SystemTools. For bootstrapping we do not need sub-1s timestamps so just define them to 0 for now.
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-06-033-12/+76
| |\ \ \ | | |/ / | |/| |
| | * | KWSys 2013-05-31 (dccf7725)KWSys Robot2013-06-033-12/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ dccf7725 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 725e541e..dccf7725 Brad King (2): e3370418 SystemTools: Use COMPILE_DEFINITIONS to pass platform tests dccf7725 SystemTools: Touch with better than 1s resolution if possible Change-Id: Icdbcdf405e27b2d5dd30857c7c8679ed5096f252
* | | | Merge topic 'cfbundle-location'Brad King2013-06-048-51/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 483e208 OS X: Fix getting of CFBundle LOCATION property.
| * | | | OS X: Fix getting of CFBundle LOCATION property.Clinton Stimpson2013-06-038-51/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #13797. The kinds of changes applied in 373faae5 for frameworks are now applied to CFBundle. The prefix and suffix for CFBundles are now handled in cmTarget::GetFullNameInternal.
* | | | | Merge topic 'qt4-macros-TARGET-arg'Brad King2013-06-046-38/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ce60ff Qt4Macros: Allow specifying a TARGET in invokations of macros.
| * | | | | Qt4Macros: Allow specifying a TARGET in invokations of macros.Stephen Kelly2013-06-036-38/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That will allow things like this: find_package(Qt4) qt4_generate_moc(myfile.h moc_myfile.cpp TARGET foo) # Note, foo target doesn't # exist until below. add_library(foo ...) The qt4_generate_moc call would use the INCLUDE_DIRECTORIES from the foo target using generator expressions. Currently it reads the INCLUDE_DIRECTORIES directory property, meaning that include_directories() is required. Support for the TARGET is also added to qt4_wrap_cpp, but not qt4_automoc, as that is deprecated in favor of the AUTOMOC target property. The moc tool reports failure if the Q_INTERFACES macro is used with an argument which has not appeared with Q_DECLARE_INTERFACE, so that is the basis of the unit test. The command line arguments are now always written to a file, which is passed to moc as the @atfile. This was already the case on Windows, but now it is used everywhere. The reason for that is that it is not currently possible to expand the list of includes from a target directly in a add_custom_command invokation (though that may become possible in the future). There is not a big disadvantage to using the file anyway on unix, so having one code path instead of two is also a motivation.
* | | | | | CMake Nightly Date StampKitware Robot2013-06-041-1/+1
| | | | | |
* | | | | | Merge topic 'escape-regex-specials-in-path'Brad King2013-06-037-37/+53
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | e4e0921 Merge branch 'master' into escape-regex-specials-in-path c9b75dc Fix test failures caused by regexp-sensitive characters in the build paths
| * | | | | Merge branch 'master' into escape-regex-specials-in-pathRolf Eike Beer2013-06-03332-1297/+5781
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining changes from both sides.
| * | | | | Fix test failures caused by regexp-sensitive characters in the build pathsModestas Vainius2013-06-037-36/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checkout [1] as an example of the test failures. In that particular cases, the failures is caused by the plus sign in the path being pass unescaped (buildd-cmake_2.8.9-1~bpo60+1-armel-3Lvkef) to the regexp. In addition to failures in the log, the following new tests also fail in 2.8.11: 243 - CTestTestMemcheckUnknown (Failed) 244 - CTestTestMemcheckUnknownQuoted (Failed) 248 - CTestTestMemcheckDummyValgrindFailPre (Failed) 249 - CTestTestMemcheckDummyValgrindFailPost (Failed) 250 - CTestTestMemcheckDummyPurify (Failed) 251 - CTestTestMemcheckDummyBC (Failed) 253 - CMake.List (Failed) [1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=armel&ver=2.8.9-1~bpo60%2B1&stamp=1369243896
* | | | | | Merge topic 'useless-MATCHES'Brad King2013-06-039-25/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd4451d replace string(... MATCHES "^const$) with string(... STREQUAL "const")
| * | | | | | replace string(... MATCHES "^const$) with string(... STREQUAL "const")Rolf Eike Beer2013-06-029-25/+19
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'target-COMPILE_OPTIONS'Brad King2013-06-0325-63/+752
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24466f2 Add target_compile_options command. 80ca9c4 Add COMPILE_OPTIONS target property. 7cb2308 cmTarget: Rename LinkInterfaceIncludeDirectoriesEntries 47f80d9 cmTarget: Rename struct to be more re-usable. 1319a14 Add <LANG>_COMPILER_ID generator expressions. 3549676 Add cmLocalGenerator::GetCompileOptions. f3ad863 VS6: Rename some variables to correspond to config values.
| * | | | | | Add target_compile_options command.Stephen Kelly2013-06-029-0/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This command populates the COMPILE_OPTIONS target property.
| * | | | | | Add COMPILE_OPTIONS target property.Stephen Kelly2013-06-0210-1/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method reads generator expressions from the COMPILE_OPTIONS target property, as well as INTERFACE_COMPILE_OPTIONS from linked dependents.
| * | | | | | cmTarget: Rename LinkInterfaceIncludeDirectoriesEntriesStephen Kelly2013-06-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used for COMPILE_OPTIONS too.
| * | | | | | cmTarget: Rename struct to be more re-usable.Stephen Kelly2013-06-021-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The same struct can be used to represent COMPILE_OPTIONS content.
| * | | | | | Add <LANG>_COMPILER_ID generator expressions.Stephen Kelly2013-06-022-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These expressions evaluate to the id of the compiler used to build the target, or can be used to test if the compiler id matches a specified value.
| * | | | | | Add cmLocalGenerator::GetCompileOptions.Stephen Kelly2013-06-029-25/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it only adds the contents of the COMPILE_FLAGS target property, but it can be extended to handle a new COMPILE_OPTIONS generator expression enabled property.
| * | | | | | VS6: Rename some variables to correspond to config values.Stephen Kelly2013-06-021-10/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | This simplifies population of the compile flags.
* | | | | | Merge topic 'refactor-try_compile-argument-processing'Brad King2013-06-0336-133/+191
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d06db7e try_compile: Refactor argument processing b680824 try_compile: Add test for bad call error cases
| * | | | | | try_compile: Refactor argument processingBrad King2013-05-3112-142/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Process all arguments in a single loop using a simple state machine. While at it, fix some error message typos. Also allow LINK_LIBRARIES with no actual libraries to disable use of the -DLINK_LIBRARIES=... from the CMAKE_FLAGS. This was already possible in the old logic if LINK_LIBRARIES was immediately followed by another keyword argument instead of the end of the argument list, so allow it in general. Update the RunCMake.try_compile test cases accordingly.
| * | | | | | try_compile: Add test for bad call error casesBrad King2013-05-3132-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a RunCMake.try_compile test to cover cases of bad invocation of the try_compile command.
* | | | | | | Merge topic 'vs-RootNamespace'Brad King2013-06-032-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cca955a VS: Add VS_GLOBAL_ROOTNAMESPACE target property
| * | | | | | | VS: Add VS_GLOBAL_ROOTNAMESPACE target propertyJohn Farrier2013-05-312-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a setting for Visual Studio projects for the root namespace in the "Globals" PropertyGroup section of the project file.
* | | | | | | | Merge topic 'fix-style'Brad King2013-06-032-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e162326 Fix indentation.
| * | | | | | | | Fix indentation.Stephen Kelly2013-05-292-3/+3
| | | | | | | | |
* | | | | | | | | Merge topic 'FindImageMagick-v6-includes'Brad King2013-06-031-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3de9bb4 FindImageMagick: Find v6 include dir (#14174)
| * | | | | | | | | FindImageMagick: Find v6 include dir (#14174)Funda Wang2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header files of ImageMagick are now located at <prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.
* | | | | | | | | | Merge topic 'SelectLibraryConfigurations-cached-library'Brad King2013-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2099a8 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
| * | | | | | | | | | SelectLibraryConfigurations: Fix for cached <base>_LIBRARYBjoern Thiel2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line set( ${basename}_LIBRARY ) removes the normal variable, but if the corresponding cached variable is present then line list( APPEND ${basename}_LIBRARY optimized "${_libname}" ) uses that and fails. Replace the original line with set( ${basename}_LIBRARY "" ) to set the normal variable to empty instead of unsetting it.
* | | | | | | | | | | Merge topic 'qt4-qt5-CMAKE_AUTOMOC'Brad King2013-06-037-3/+95
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa55751 QtAutomoc: Get the Qt version through the target link interface f776316 Use the qt5::moc imported target instead of a variable.
| * | | | | | | | | | | QtAutomoc: Get the Qt version through the target link interfaceStephen Kelly2013-05-277-5/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 5.1, Qt5::Core has a INTERFACE_QT_MAJOR_VERSION property of '5', and since CMake 2.8.11, Qt4::QtCore has an INTERFACE_QT_MAJOR_VERSION of '4'. This was introduced in commit 4aa10cd6 (FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore, 2013-03-16), to produce an error if Qt 4 and Qt 5 are erroneously used by the same target. This can also be used however to determine the Qt major version, and therefore the particular moc executable to use during automoc steps. This means that targets in a single buildsystem can use a selection of Qt 4 and Qt 5, and still take advantage of the CMAKE_AUTOMOC feature without conflicting.
| * | | | | | | | | | | Use the qt5::moc imported target instead of a variable.Stephen Kelly2013-05-272-1/+18
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable is provided in the Qt5 config files only for compatibility with this automoc feature, so use the more-future-proof method instead.
* | | | | | | | | | | Merge topic 'rpath-on-mac'Brad King2013-06-0329-33/+626
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc1d025 OS X: Add test for rpaths on Mac. 8576b3f OS X: Add support for @rpath in export files. 00d71bd Xcode: Add rpath support in Xcode generator. 94e7fef OS X: Add RPATH support for Mac.
| * | | | | | | | | | | OS X: Add test for rpaths on Mac.Clinton Stimpson2013-06-0312-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also tests rpaths through export/import.
| * | | | | | | | | | | OS X: Add support for @rpath in export files.Clinton Stimpson2013-06-039-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also expand the IMPORTED_SONAME property for targets to match the install_name.
| * | | | | | | | | | | Xcode: Add rpath support in Xcode generator.Clinton Stimpson2013-06-031-0/+23
| | | | | | | | | | | |
| * | | | | | | | | | | OS X: Add RPATH support for Mac.Clinton Stimpson2013-06-038-32/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPATH support is activated on targets that have the MACOSX_RPATH property turned on. For install time, it is also useful to set INSTALL_RPATH to help find dependent libraries with an @rpath in their install name. Also adding detection of rpath conflicts when using frameworks.
generated by cgit v0.12 at 2025-02-05 10:27:15 (GMT)