summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindSWIG: Do not generate erroneous outputs with -noproxyBen Webb2015-09-091-4/+6
| | | | | | | | | | | | | Generally for a module foo, SWIG generates (in Python mode) an extension module _foo.so and a proxy Python module foo.py. However, if -noproxy is specified, instead it builds only foo.so (without the leading underscore). The custom command generated by CMake correctly handles the removal of this underscore when -noproxy is given; however, it still adds foo.py to the expected outputs. This upsets build tools that expect foo.py to be generated (for example, 'make' will run the SWIG command twice). Fix this by removing foo.py from the set of extra generated files when -noproxy is specified.
* CMake Nightly Date StampKitware Robot2015-09-091-1/+1
|
* Merge topic 'fix-buildsystem-target-properties'Brad King2015-09-0817-31/+90
|\ | | | | | | | | | | | | b9856862 Tests: Cover set_property for buildsystem target properties 407ff47e cmTarget: Fix memory leak when SOURCES property is cleared cf74fc24 cmTarget: Fix buildsystem property empty value set and append operations
| * Tests: Cover set_property for buildsystem target propertiesBrad King2015-09-0316-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the RunCMake.set_property test with cases covering buildsystem target properties: * COMPILE_DEFINITIONS * COMPILE_FEATURES * COMPILE_OPTIONS * INCLUDE_DIRECTORIES * LINK_LIBRARIES * SOURCES Also test a non-buildsystem property to document the current difference in behavior. Refactor the existing LINK_LIBRARIES case to the same more-extensive test as the rest. Use the output generated by CMake 3.3 as the expected output for each test case.
| * cmTarget: Fix memory leak when SOURCES property is clearedBrad King2015-09-031-0/+1
| |
| * cmTarget: Fix buildsystem property empty value set and append operationsBrad King2015-09-031-24/+48
| | | | | | | | | | | | | | | | | | | | Refactoring in commit 1f54bc1c (cmTarget: Split storage of include directories from genexes, 2015-08-04), commit 772ecef4 (cmTarget: Split storage of compile options from genexes, 2015-08-04), commit 44e071ae (cmTarget: Split storage of compile features from genexes, 2015-08-04), and commit 197f4de1 (cmTarget: Split storage of compile definitions from genexes, 2015-08-04) failed to account for value==NULL in SetProperty and AppendProperty methods.
* | Merge topic 'find_program-NAMES_PER_DIR'Brad King2015-09-0823-27/+214
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ea7611b find_program: Optionally consider all names in each directory fc1990c9 cmFindProgramCommand: Re-implement search using more flexible approach fdbfc9f6 Tests: Add explicit testing for find_program 907a919b cmSystemTools: Drop unused StringEndsWith method ed4de3c9 cmFindProgramCommand: Use Names member instead of passing it bf32b95e cmFindLibraryCommand: Avoid repeating search for the same name
| * | find_program: Optionally consider all names in each directoryBrad King2015-09-027-1/+64
| | | | | | | | | | | | | | | | | | | | | When more than one value is given to the NAMES option this command by default will consider one name at a time and search every directory for it. Add a NAMES_PER_DIR option to tell this command to consider one directory at a time and search for all names in it.
| * | cmFindProgramCommand: Re-implement search using more flexible approachBrad King2015-09-022-1/+97
| | | | | | | | | | | | | | | | | | | | | | | | Avoid using KWSys SystemTools::FindProgram because it does much more than we actually need for find_program and does not allow us to control the order of preference between directories and names. Create our own cmFindProgramHelper much like cmFindLibraryHelper but without all the find_library-specific parts.
| * | Tests: Add explicit testing for find_programBrad King2015-09-0214-0/+35
| | | | | | | | | | | | | | | | | | Previously this command was tested only implicitly as part of larger tests. Add a RunCMake.find_program test to cover find_program cases specifically and independently.
| * | cmSystemTools: Drop unused StringEndsWith methodBrad King2015-09-022-11/+0
| | | | | | | | | | | | It has no callers and we can inherit one from KWSys SystemTools anyway.
| * | cmFindProgramCommand: Use Names member instead of passing itBrad King2015-09-022-13/+10
| | |
| * | cmFindLibraryCommand: Avoid repeating search for the same nameBrad King2015-09-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | In FindNormalLibraryDirsPerName we consider one name at a time and search the entire path. Avoid repeated consideration of names by removing each one from the list of candidates before considering the next one. This will not change behavior because we already know the earlier candidates were not found on repeated considering anyway.
* | | Merge topic 'FindOpenSSL-static-libs'Brad King2015-09-082-5/+35
|\ \ \ | | | | | | | | | | | | | | | | 369a8cde FindOpenSSL: Optionally search only for static libraries
| * | | FindOpenSSL: Optionally search only for static librariesThijs Wenker2015-09-022-5/+35
| |/ / | | | | | | | | | | | | | | | | | | Add an OPENSSL_USE_STATIC_LIBS option to enable it. Adjust CMAKE_FIND_LIBRARY_SUFFIXES to only look for .a and .lib files. Also adjust the search paths on Windows for installer locations of static libraries.
* | | Merge topic 'FindZLIB-per-config'Brad King2015-09-082-5/+45
|\ \ \ | | | | | | | | | | | | | | | | 11097f52 FindZLIB: Find debug and release variants separately
| * | | FindZLIB: Find debug and release variants separatelyMichael Scott2015-09-022-5/+45
| |/ / | | | | | | | | | | | | | | | Provide each variant in ZLIB_LIBRARIES and ZLIB::ZLIB imported location properties when one is found, while maintaining support for manually setting the library via ZLIB_LIBRARY.
* | | Merge topic 'update-kwsys'Brad King2015-09-0844-3473/+1396
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2b8229d Tests: Fix Plugin test on Watcom compiler 89958fd0 bootstrap: Remove unused KWSys configuration c5cc3441 Merge branch 'upstream-kwsys' into update-kwsys 1b79433a KWSys 2015-08-28 (dc3fdd7f)
| * | | Tests: Fix Plugin test on Watcom compilerBrad King2015-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The Watcom compiler does not have stream operators for std::string. Since KWSys no longer provides the operators for us, just use c_str() to avoid the problem and allow the test to compile on Watcom.
| * | | bootstrap: Remove unused KWSys configurationBrad King2015-09-021-269/+1
| | | | | | | | | | | | | | | | | | | | | | | | KWSys has removed support for kwsys_ios, kwsys_stl, and pre-c++98 template compatibility layers. Drop the bootstrap script checks for these and configuration of the compatibility headers we no longer use.
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-09-0242-3203/+1394
| |\ \ \ | | |/ / | |/| |
| | * | KWSys 2015-08-28 (dc3fdd7f)KWSys Robot2015-09-0242-3203/+1394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ dc3fdd7f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' cdaf522c..dc3fdd7f Brad King (9): 15a16826 Remove include <kwsys/ios/*> and kwsys_ios:: compatibility layer a5799c17 Remove unused KWSYS_IOS_USE_{SSTREAM,STRSTREAM_H,STRSTREA_H} checks 198957cf Remove unused KWSYS_IOS_USE_SSTREAM check 24d2b60e Remove support for pre-C++98 streams 2a581c30 Remove support for pre-C++98 std::string missing operators 5f3fd465 Remove support for pre-C++98 STL cded1574 Remove support for pre-C++98 STL from hash_map and hash_set f130a3ab Remove kwsys/cstddef compatibility header dc3fdd7f Remove support for pre-C++98 template capabilities
* | | | CMake Nightly Date StampKitware Robot2015-09-081-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-09-071-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-09-061-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-09-051-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-09-041-1/+1
| |_|/ |/| |
* | | Merge topic 'release-scripts-doc-dir'Brad King2015-09-038-11/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6f7edb87 Utilities/Release: Install docs in unversioned directory (#15692) 7d891cde Utilities/Release: Refactor bootstrap argument construction
| * | | Utilities/Release: Install docs in unversioned directory (#15692)Brad King2015-09-026-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our upstream-built release tarballs already contain many unversioned paths and so will never overlap with another version of CMake in the same installation prefix. Therefore we do not need a versioned name for the documentation directory. Configure our release binaries to place the documentation in an unversioned directory so that one can use the same path to refer to the documentation locally even after updating CMake. For example, on OS X one may see the documentation in `/Applications/CMake.app/Contents/doc/cmake/html/index.html`.
| * | | Utilities/Release: Refactor bootstrap argument constructionBrad King2015-09-026-11/+8
| |/ / | | | | | | | | | | | | Pass needed bootstrap arguments directly instead of constructing them from various conditions.
* | | Merge topic 'add-link-search-static-properties-defaults'Brad King2015-09-036-2/+8
|\ \ \ | | | | | | | | | | | | | | | | 18d7f8fb Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated test
| * | | Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated testBrad King2015-09-026-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case added to RunCMake.set_property by commit 675ef165 (Allow LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07) is not a test of the set_property command and so belongs in its own test case. Create a new RunCMake.LinkStatic test to cover cases related to static linking. While at it, simplify the LINK_SEARCH_STATIC test case to enable only C.
* | | | Merge topic 'vs-store-phone-cert-thumbs'Brad King2015-09-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7c33b0f9 cmSystemTools: Skip ComputeCertificateThumbprint during bootstrap
| * | | | cmSystemTools: Skip ComputeCertificateThumbprint during bootstrapBrad King2015-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The implementation of this method requires linking to some extra system libraries. Simply leave it out of the bootstrap-built CMake.
* | | | | CMake Nightly Date StampKitware Robot2015-09-031-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'FindHDF5-updates'Brad King2015-09-021-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f7f73df1 FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL 19e7db07 FindHDF5: Fix support for HL and Fortran_HL components
| * | | | FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HLPaul Romano2015-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Fortran_HL component is specified, the hdf5_hl library is not included in HDF5_LIBRARIES which causes a bunch of undefined references at link time. This commit adds hdf5_hl to the list of libraries to search for when the Fortran_HL component is specified.
| * | | | FindHDF5: Fix support for HL and Fortran_HL componentsPaul Romano2015-09-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define HDF5_{Fortran_,}HL_COMPILE_LINE so that HDF5_{Fortran_,}HL_INCLUDE_DIR and HDF5_{Fortran_,}HL_LIBRARIES are found when the macro is invoked for HL and Fortran_HL components. (Use patch from debian cmake-data package.)
* | | | | Merge topic 'swift2-compatibility'Brad King2015-09-022-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 61b6d52a Swift: Use dump instead of println
| * | | | | Swift: Use dump instead of printlnGregor Jasny2015-09-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Swift 2.0 in Xcode7 the println function was renamed into print. Use dump function instead which adds newlines like println.
* | | | | | Merge topic 'modules-no-soname'Brad King2015-09-023-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21d99aa3 Tests: Use a less strict regular expression to look for "SONAME"
| * | | | | | Tests: Use a less strict regular expression to look for "SONAME"Raphael Kubo da Costa2015-09-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 899458ab (Tests: Cover NO_SONAME property for SHARED libraries, 2015-08-20) introduced a few new ExportImport tests, and the check_lib_{no}soname.cmake scripts that parse readelf(1)'s output. Make the regular expression matching the SONAME line output by readelf less strict, as the output format varies across implementations: GNU binutils' readelf is the only one to write each ELF header within parentheses (which the previous regular expression expected). The new tests were thus failing when either Fedora's elfutils (eu-readelf) or elftoolchain's readelf (present on recent FreeBSD versions) were being used, as they both list the headers without parentheses. The same issue also affected Tests/Plugin's check_mod_soname.cmake, so fix that one as well -- the only reason the test was not failing is that it tested that the regular expression did not match, which was always the case with a non-binutils readelf.
* | | | | | | CMake Nightly Date StampKitware Robot2015-09-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'drop-cmsys-std-layer'Brad King2015-09-011-10/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 76fa8596 Tests: Remove use of include <kwsys/{ios,stl}> and kwsys_{ios,stl}::
| * | | | | | Tests: Remove use of include <kwsys/{ios,stl}> and kwsys_{ios,stl}::Brad King2015-08-311-10/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | We no longer need this compatibility layer for the compilers we support.
* | | | | | Merge topic 'jacoco_find_files'Brad King2015-09-011-52/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e92c59e7 ctest_coverage: Make Jacoco parser better at finding source files
| * | | | | | ctest_coverage: Make Jacoco parser better at finding source filesZack Galbreath2015-09-011-52/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of searching for source files in a couple hard-coded locations, we now search the source and binary directory for files matching both the name of the covered file and its package directory structure.
* | | | | | | Merge topic 'fix-ios-install'Brad King2015-09-018-6/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad262917 Xcode: Add unit test for iOS project install (#12506) 48fe617e Fix installation of iOS targets (#12506) d2c2319d Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos
| * | | | | | | Xcode: Add unit test for iOS project install (#12506)Gregor Jasny2015-08-264-0/+29
| | | | | | | |
| * | | | | | | Fix installation of iOS targets (#12506)Gregor Jasny2015-08-252-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since cmTarget::ComputeOutputDir results can be used in CMake code of script cmake_install.cmake and in Xcode internals, string ${EFFECTIVE_PLATFORM_NAME} should be used instead of $(EFFECTIVE_PLATFORM_NAME) because it works for both. Value of CMAKE_CFG_INTDIR can't be used in BUILD_TYPE argument of install command since it contains $(EFFECTIVE_PLATFORM_NAME) (e.g. equals to `Release-iphoneos`, `Debug-iphoneos`, etc.).
generated by cgit v0.12 at 2025-01-23 14:01:45 (GMT)