summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* set_property: Do not remove a property when APPENDing nothingBen Boeckel2013-07-244-2/+15
|
* Merge topic 'AddCommentsToExportsFile'Brad King2013-07-221-1/+3
|\ | | | | | | | | 4b1919f ExportTargets: add one more comment to the generated file.
| * ExportTargets: add one more comment to the generated file.Alex Neundorf2013-07-191-1/+3
| | | | | | | | | | | | | | | | This patch adds a comment above the block which protects the exported targets file against multiple inclusion, to make the file easier to understand for readers. Alex
* | Merge topic 'rpath-on-mac'Brad King2013-07-228-22/+67
|\ \ | | | | | | | | | | | | | | | 603bc59 OS X: Fix regression handling frameworks for Ninja e645ff0 OS X: Enable rpath support on Mac OS X when find_library() is used.
| * | OS X: Fix regression handling frameworks for NinjaClinton Stimpson2013-07-222-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression created by commit 373faae5 (Refactor how bundles and frameworks are supported, 2013-05-05). Since the ninja file isn't aware of how framework symlinks work, we suppress symlink creation and let cmOSXBundleGenerator handle it. Also, use the real name of framework library in build rules as was done before, instead of the symlink.
| * | OS X: Enable rpath support on Mac OS X when find_library() is used.Clinton Stimpson2013-07-166-19/+56
| | |
* | | Merge topic 'SelectLibraryConfigurations'Brad King2013-07-222-45/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | 04d4dc3 SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars 07b44e7 SelectLibraryConfigurations: Do not cache the _LIBRARY variable
| * | | SelectLibraryConfigurations: Use -NOTFOUND instead of copying the varsDaniele E. Domenichelli2013-07-222-41/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one of the libraries (_DEBUG or _RELEASE) is not set, the value is set to the value of the other one. FindQt4, from which the macro is extracted, sets the values to XXX_LIBRARY_{DEBUG,RELEASE}-NOTFOUND instead. In both cases the XXX_LIBRARY is correct, but using NOTFOUND makes it easier to understand which one is missing. Update Tests/CMakeOnly/SelectLibraryConfigurations with the new logic.
| * | | SelectLibraryConfigurations: Do not cache the _LIBRARY variableDaniele E. Domenichelli2013-07-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SelectLibraryConfigurations module currently cache and mark as advanced the variable ${basename}_LIBRARY. ${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG are usually cached, because they often come from find_library(). ${basename}_LIBRARY on the other hand is always of type "optimized;${${basename}_LIBRARY_RELEASE};debug;${${basename}_LIBRARY_DEBUG}" or just "${basename}_LIBRARY_RELEASE" or "${basename}_LIBRARY_DEBUG" if only one version of the library is not found, if both have the same value, or if configuration types are not supported. Caching and marking as advanced just ${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG is enough, just by modifying these two variables, the user has enough control on finding the library, and having 3 variables is redundant and confusing.
* | | | Merge topic 'cpack-wix'Brad King2013-07-225-13/+164
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf23891 CPackWIX: Add support for custom WiX templates 155bb01 CMakeCPack: Provide an upgrade guid for WiX bfa2e29 CPackWIX: Add option to specify the language(s) of the installer 6e51ea9 CPackWIX: Handle multiple shortcuts in the start menu 6d77e1a CPackWIX: Fix MSI package layout regression from parent 8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)
| * | | | CPackWIX: Add support for custom WiX templatesAdam J. Weigold2013-07-192-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WiX provides a lot of functionality for installers that cannot be supported (easily) in the default WIX.template.in file. For most users, the default template should be fine. However if users want to produce merge modules, include custom actions, etc, this new option allows for a hook into how the wxs is produced.
| * | | | CMakeCPack: Provide an upgrade guid for WiXRichard Ulrich2013-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CPACK_WIX_UPGRADE_GUID. Without this upgrade GUID, you end up with multiple instances of the same installation when installing cmake from a WIX generated installer.
| * | | | CPackWIX: Add option to specify the language(s) of the installerRichard Ulrich2013-07-192-0/+16
| | | | | | | | | | | | | | | | | | | | Add option "CPACK_WIX_CULTURES".
| * | | | CPackWIX: Handle multiple shortcuts in the start menuRichard Ulrich2013-07-191-7/+13
| | | | |
| * | | | CPackWIX: Fix MSI package layout regression from parentIan Monroe2013-07-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a regression where if the install directory had: parent child A child B the produced MSI would install: parent child A child B
| * | | | CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)Fredrik Axelsson2013-07-194-10/+128
| | | | | | | | | | | | | | | | | | | | | | | | | Add start menu items including an uninstall shortcut. Add variable CPACK_WIX_PROGRAM_MENU_FOLDER to configure folder name.
* | | | | Merge topic 'mingw-in-codeblocks'Brad King2013-07-221-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9cdc5e6 MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
| * | | | | MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)Jason Spiro2013-07-191-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one installs MinGW using the Code::Blocks IDE installer it goes to a path like "c:\Program Files\CodeBlocks\MinGW", not "c:\MinGW". Use the CodeBlocks registry entry to get the location. Signed-off-by: Jason Spiro <jasonspiro4@gmail.com>
* | | | | CMake Nightly Date StampKitware Robot2013-07-221-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-201-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2013-07-191-1/+1
| | | |
* | | | Merge topic 'abi-check-tolerate-COPY_FILE-failure'Brad King2013-07-186-2/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4dc4018 Teach compiler ABI check to tolerate try_compile COPY_FILE failure
| * | | | Teach compiler ABI check to tolerate try_compile COPY_FILE failureBrad King2013-07-176-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeDetermineCompilerABI we use try_compile with the COPY_FILE option to get a copy of the compiled binary used to detect the ABI information. We already tolerate the case when compilation fails. However, when compilation appears to succeed but does not produce the expected executable the try_compile command immediately reports an error because the COPY_FILE fails. Tolerate COPY_FILE failure without stopping the overall configuration process by using the try_compile COPY_FILE_ERROR option to capture the error message. Log the full error to CMakeError.log and simply report failure to detect the ABI as if compilation had failed. Teach the RunCMake.Configure test to cover this case and verify that the messages show up as expected both in stdout and in CMakeError.log.
* | | | | Merge topic 'custom-command-assignment'Brad King2013-07-182-0/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 17c841c add_custom_command: Manage backtrace memory correctly (#14299)
| * | | | | add_custom_command: Manage backtrace memory correctly (#14299)Brad King2013-07-172-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an assignment operator to cmCustomCommand to copy the Backtrace member pointee and avoid multiple-free on destruction. Reported-by: Vitezslav Cizek <vcizek@suse.cz>
* | | | | | Merge topic 'UseJava-copyright'Brad King2013-07-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53431ea UseJava: Update notice of copyright by Kitware
| * | | | | | UseJava: Update notice of copyright by KitwareBrad King2013-07-171-1/+1
| | | | | | |
* | | | | | | Merge topic 'doc-add_test-names'Brad King2013-07-181-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d017058 add_test: Document test name restrictions (#14298)
| * | | | | | | add_test: Document test name restrictions (#14298)Brad King2013-07-171-0/+3
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-07-181-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'INTERFACE_LINK_LIBRARIES-prop'Brad King2013-07-171-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 295a42c Fix ExportImport test cmp0022NEW build on Watcom
| * | | | | | | Fix ExportImport test cmp0022NEW build on WatcomBrad King2013-07-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test uses generate_export_header(cmp0022OLD ...) to generate the cmp0022_export.h header used by both cmp0022OLD and cmp0022NEW. In the latter the _EXPORTS symbol does not match what the header expects so the library does not export anything. The Watcom linker does not like to create shared libraries that do not export any symbols. Fix this by setting the DEFINE_SYMBOL property on cmp0022NEW to match that of cmp0022OLD as the header expects.
* | | | | | | | Merge topic 'osx-fortran-dylib-versions'Brad King2013-07-174-0/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af8c8d OS X: Add Fortran library version flags (#14249) 2cc9f1f OS X: Add copyright notices to Darwin-*-Fortran.cmake
| * | | | | | | | OS X: Add Fortran library version flags (#14249)Graham Markall2013-07-164-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker flags for setting the compatibility and current versions of libraries on Darwin are set for the supported Fortran compilers. Set CMAKE_Fortran_CREATE_SHARED_LIBRARY for the NAG Fortran compiler to have no space after <SONAME_FLAG> so the NAG compiler can parse the argument correctly.
| * | | | | | | | OS X: Add copyright notices to Darwin-*-Fortran.cmakeBrad King2013-07-163-0/+39
| | | | | | | | |
* | | | | | | | | Merge topic 'UseJava-response-file'Brad King2013-07-171-1/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 177c051 UseJava: Pass sources to javac using response file (#13028)
| * | | | | | | | UseJava: Pass sources to javac using response file (#13028)Graham Markall2013-07-161-1/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line string passed to javac can exceed the 8191-character limit on Windows when there are a large number of files to compile. To avoid this, the list of sources is written to a file which is then passed to javac as an argfile. Spaces in paths are dealt with by enclosing each file in quotes, and separating files with a newline.
* | | | | | | | CMake Nightly Date StampKitware Robot2013-07-171-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'drop-old-vs-dependency'Brad King2013-07-166-25/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bb6e24 VS,Xcode: Drop incorrect legacy dependency trace (#14291)
| * | | | | | | VS,Xcode: Drop incorrect legacy dependency trace (#14291)Brad King2013-07-156-25/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the "vsProjectFile" argument from cmTarget::TraceDependencies. It appears to be the modern equivalent to a hunk added in commit ba68f771 (...added new custom command support, 2003-06-03): + name = libName; + name += ".dsp.cmake"; + srcFilesToProcess.push(name); but was broken by refactoring at some point. The current behavior tries to trace dependencies on a source file named the same as a target, which makes no sense. Furthermore, in code of the form add_executable(foo foo.c) add_custom_command(OUTPUT "${somewhere}/foo" ... DEPENDS foo) the "vsProjectFile" value "foo" matches source "${somewhere}/foo.rule" generated to hold the custom command and causes the command to be added to the "foo" target incorrectly. Simply drop the incorrect source file trace and supporting logic.
* | | | | | | | Merge topic 'cppcheck-fixes'Brad King2013-07-166-6/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a20c819 cmake: Fix resource leak reported by cppcheck c8adab9 cmcurl: Fix resource leak reported by cppcheck 499531c libarchive: Fix free() order to avoid accessing freed memory 3b849a7 ccmake: Add missing initializers reported by cppcheck
| * | | | | | | | cmake: Fix resource leak reported by cppcheckBrad King2013-07-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return early in cmake::ReportUndefinedPropertyAccesses if there is no global generator instead of opening a file and leaking the descriptor. Reported-by: Ömer Fadıl USTA <omerusta@gmail.com>
| * | | | | | | | cmcurl: Fix resource leak reported by cppcheckÖmer Fadıl USTA2013-07-153-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing fclose calls. Reviewed-by: Igor Murzov <e-mail@date.by>
| * | | | | | | | libarchive: Fix free() order to avoid accessing freed memoryÖmer Fadıl USTA2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The archive_string_conv type sc variable already freed via free(sc) on the other hand in second line we are tyring to free its subset via free(sc->from_charset) this will cause a problem because we couldn't reach sc after first release. Reviewed-by: Igor Murzov <e-mail@date.by>
| * | | | | | | | ccmake: Add missing initializers reported by cppcheckÖmer Fadıl USTA2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return statement uses d1, d2, d3, and d4 variables but the code which initialize them inside a if statement and not always this if statement is corrent. On the other hand these variables are using for return statement and needed to be initialized. A trivial fix to pervent some compilers will give build error. Reviewed-by: Igor Murzov <e-mail@date.by>
* | | | | | | | | Merge topic 'FindPNG-1.6'Brad King2013-07-161-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96fa4a2 FindPNG: Add versioned library names for 1.6 (#14289)
| * | | | | | | | | FindPNG: Add versioned library names for 1.6 (#14289)Brad King2013-07-151-1/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, refactor the versioned library name list generation to reduce duplication.
* | | | | | | | | Merge topic 'obsolete-qt4-macros'Brad King2013-07-1612-0/+71
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb7f32f Mark qt4_use_modules and qt4_automoc as obsolete.
| * | | | | | | | | Mark qt4_use_modules and qt4_automoc as obsolete.Stephen Kelly2013-07-1412-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QT_QMAKE_EXECUTABLE has to be passed through the cmake calls because the executable may not be in the PATH.
generated by cgit v0.12 at 2024-11-08 15:13:50 (GMT)