summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* ExternalData: Attach download rules to content links in IDEsBrad King2013-02-041-2/+2
| | | | | | | Each data file to be created in the build tree corresponds one-to-one with a raw file or content link in the source tree. Use the MAIN_DEPENDENCY of add_custom_command to attach the build rule to the source tree file. This looks much nicer in the IDE project file browser and avoids ".rule" files.
* ExternalData: Collapse ../ components in DATA{} pathsBrad King2013-01-301-1/+2
| | | | | Relative path components need to be normalized out even if they appear in the middle of a caller-supplied string.
* ExternalData: Add support for SHA 1 and 2 hash algorithmsBrad King2013-01-301-2/+7
| | | | | Update the Module.ExternalData and RunCMake.ExternalData tests to cover some of them.
* ExternalData: Generalize hash algo/ext handlingBrad King2013-01-301-11/+9
| | | | | | | Use private global variables _ExternalData_REGEX_(ALGO|EXT) to match the possible hash algorithm names and extensions in regular expressions. Use "file(<algo>)" instead of "cmake -E md5sum" to compute hashes without a child process and to support more hash algorithms.
* ExternalData: Allow DATA{} syntax to reference directoriesBrad King2013-01-301-7/+38
| | | | | | | Use a trailing slash to reference a directory. Require that a list of associated files be specified to select from within the directory. One may simply use DATA{Dir/,REGEX:.*} to reference all files but get a directory passed on the command line.
* ExternalData: Allow ()-groups in series match regexBrad King2013-01-301-5/+8
| | | | | | | Refactor use of the ExternalData_SERIES_MATCH value to avoid assuming that it has no ()-groups that interfere with group indexing. Extend the Module.ExternalData test to cover this case.
* ExternalData: Improve series matching using an explicit syntaxBrad King2013-01-291-27/+55
| | | | | | | | | | | | | | Automatic series recognition can generate false positives too easily when the default series configuration is flexible enough to handle common cases. Avoid false positives by requiring an explicit syntax to activate series recognition. Choose the syntax DATA{<name>,:} to be short, simple, and look like a vertical ellipsis. This allows us to improve the default series match configuration. Allow series references to contain one of the numbered file names. Allow '-' as a separator in addition to '.' and '_'. Document what the default configuration matches. Also provide more options to configure series <name> parsing.
* ExternalData: Remove unused private interfaceBrad King2013-01-281-10/+0
| | | | | The 'store' action was part of an older design and is no longer needed. Remove it.
* ExternalData: Cleanup stray TODO and typo in commentsBrad King2013-01-281-2/+1
| | | | | Remove an outdated TODO line left from earlier designs. Also fix a typo.
* ExternalData: Do not match directory names when resolving DATA{}Brad King2013-01-281-2/+9
| | | | | | Our content link and object download infrastructure supports only blobs (files), not trees (directories). Do not allow references to end in a slash.
* ExternalData: Remove compatibility with CMake < 2.8.5Brad King2013-01-241-17/+6
| | | | | Now that the module comes in a sufficiently new CMake it does not need to support older versions.
* Add ExternalData moduleBrad King2013-01-242-0/+714
| | | | | | | | | | Take files we previously distributed in ITK 4.3.1: CMake/ExternalData.cmake CMake/ExternalData_config.cmake.in and add them for distribution in upstream CMake. Update the copyright notice block format to follow CMake conventions.
* Merge topic 'qt4-autolink-qtmain'Brad King2013-01-231-0/+28
|\ | | | | | | | | | | e3b5eb6 Automatically link to the qtmain library when linking to QtCore. 6c8d8af Add the $<TARGET_POLICY> expression
| * Automatically link to the qtmain library when linking to QtCore.Stephen Kelly2013-01-231-0/+28
| | | | | | | | | | When using QAxServer, ensure that the qtmain library is excluded by reporting an error at CMake time if it is not.
* | ExternalProject: Allow DEPENDS on normal targets (#13849)Brad King2013-01-161-2/+5
|/ | | | | | | | | | | | | | | | The ExternalProject_Add DEPENDS option adds two types of dependencies. It adds a target-level build order dependency between the external project target and the named targets. It also adds a file-level dependency on the "done" stamp file of the named external project targets. Targets not created by ExternalProject_Add have no such stamp file and no _EP_STAMP_DIR property. Prior to commit d14c0243 (Refactor repeated code into function, 2012-04-26) we unconditionally accepted an empty stamp dir and generated a dependency on a non-existent file. After that commit we generate an error that no stamp dir is set. Skip the file-level dependency when the named dependency is not an external project target in order to allow this use case. Teach the ExternalProject test to cover the case.
* Merge topic 'qt4-target-depends'Brad King2013-01-101-0/+26
|\ | | | | | | | | c8ee07d FindQt4: Add INTERFACE includes and defines to Qt4 targets
| * FindQt4: Add INTERFACE includes and defines to Qt4 targetsStephen Kelly2013-01-101-0/+26
| |
* | Merge topic 'Haiku'Brad King2013-01-106-27/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 0380f36 FindOpenGL: add Haiku paths 8e9630c FindGLUT: BeOS does not have libXi and libXmu 50bfedf FindLua51: do not try to link libm on BeOS 3d2e6a0 check for Haiku only with __HAIKU__ 7a1b961 Haiku no longer defines __BEOS__ ed96d9a bootstrap: use better defaults for Haiku
| * | FindOpenGL: add Haiku pathsRolf Eike Beer2013-01-071-9/+21
| | | | | | | | | | | | Also check the HP-UX specific paths only when on HP-UX.
| * | FindGLUT: BeOS does not have libXi and libXmuRolf Eike Beer2013-01-071-7/+21
| | |
| * | FindLua51: do not try to link libm on BeOSRolf Eike Beer2013-01-071-1/+1
| | | | | | | | | | | | | | | This includes Haiku, which currently is treated as BeOS. The ComplexOneConfig test already knew about this.
| * | check for Haiku only with __HAIKU__Rolf Eike Beer2013-01-072-9/+2
| | |
| * | Haiku no longer defines __BEOS__Rolf Eike Beer2013-01-071-1/+1
| |/
* | Merge topic 'qt4-version-openssl'Brad King2013-01-081-5/+5
|\ \ | |/ |/| | | | | 4b9ec00 FindQt4: set QT_VERSION_* variables sooner.
| * FindQt4: set QT_VERSION_* variables sooner.Clinton Stimpson2013-01-071-5/+5
| | | | | | | | | | Set QT_VERSION_* variables sooner so they can be set before Qt4ConfigDependentSettings.cmake uses them.
* | Merge topic 'osx-implicit-link-dirs'Brad King2013-01-078-21/+78
|\ \ | | | | | | | | | | | | | | | | | | cc676c3 OS X: Detect implicit linker framework search paths 2dd67c7 OS X: Detect implicit link directories on modern toolchains ba58d0c OS X: Link with all framework search paths, not just the last
| * | OS X: Detect implicit linker framework search pathsBrad King2012-12-116-15/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we hard-coded a list of implicit framework directories but did not account for CMAKE_OSX_SYSROOT or for changes to the list across OS X versions. Instead we should automatically detect the framework directories for the active toolchain. The parent commit added the "-Wl,-v" option to ask "ld" to print its implicit directories. It displays a block such as: Framework search paths: /... Parse this block to extract the list of framework directories. Detection may fail on toolchains that do not list their framework directories, such as older OS X linkers. Always treat the paths <sdk>/Library/Frameworks <sdk>/System/Library/Frameworks <sdk>/Network/Library/Frameworks # Older OS X only /System/Library/Frameworks as implicit. Note that /System/Library/Frameworks should always be considered implicit so that frameworks CMake finds there will not override the SDK copies.
| * | OS X: Detect implicit link directories on modern toolchainsBrad King2012-12-114-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We detect the implicit link directories for the toolchain by adding a flag to get verbose output from the compiler front-end while linking the ABI detection binary. Newer OS X toolchains based on Clang do not add the implicit link directories with -L options to their internal invocation of "ld". Instead they use a linker that comes with the toolchain and is already configured with the proper directories. Add the "-Wl,-v" option to ask "ld" to print its implicit directories. It displays them in a block such as: Library search paths: /... Parse this block to extract the implicit link directories. While at it, remove the checks introduced by commit efaf335b (Skip implicit link information on Xcode, 2009-07-23) and commit 5195a664 (Skip implicit link info for multiple OS X archs, 2009-09-22). Discard the non-system link directories added by Xcode. Discard all detected implicit libraries in the multi-architecture case but keep the directories. The directories are still useful without the libraries just to suppress addition of explicit -L options for them.
* | | Merge topic 'qt4-target-depends'Brad King2013-01-071-0/+55
|\ \ \ | |_|/ |/| | | | | | | | 57a67bf Qt4: Add module dependencies to the IMPORTED targets
| * | Qt4: Add module dependencies to the IMPORTED targetsStephen Kelly2013-01-071-0/+55
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This means for example, that consumers can use: target_link_libraries(foo ${QT_QTGUI_LIBRARIES}) instead of also needing to specify all 'public' dependencies: target_link_libraries(foo ${QT_QTGUI_LIBRARIES} ${QT_QTCORE_LIBRARIES} ) when using the IMPORTED targets. Also populate the IMPORTED_LINK_DEPENDENT_LIBRARIES property so CMake can help the linker find shared library dependencies.
* | Merge topic 'FixSDLSearchPaths'Brad King2013-01-035-5/+10
|\ \ | | | | | | | | | | | | fb864d6 FindSDL_...: Restore dropped search paths (#13819)
| * | FindSDL_...: Restore dropped search paths (#13819)Benjamin Eikel2012-12-305-5/+10
| | | | | | | | | | | | | | | Restore the search paths that were accidentally dropped by me in commit 9ed24c53. This was already fixed for FindSDL.cmake in commit 7cb51739.
* | | CPack: WIX Product Icon, UI Banner, UI Dialog support (#13789)Eric LaFranchi2012-12-282-0/+39
| |/ |/|
* | Merge topic 'ConfigHelperMinorCommentFix'David Cole2012-12-111-0/+5
|\ \ | | | | | | | | | | | | 8039bd0 CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments
| * | CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated commentsAlex Neundorf2012-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIGURE_PACKAGE_CONFIG_FILE() now additionally generates "Any changes to this file will be overwritten by the next CMake run The input file was FooConfig.cmake.in" into the configured file. Alex
* | | Merge topic 'OpenBSD-patches'David Cole2012-12-113-8/+24
|\ \ \ | |/ / |/| | | | | | | | f80ccac OpenBSD: Add paths for Qt3/Qt4
| * | OpenBSD: Add paths for Qt3/Qt4Amit Kulkarni2012-12-053-8/+24
| | | | | | | | | | | | | | | | | | | | | Handle OpenBSD specific paths in Qt3/Qt4, allowing concurrent building and installation. Some common programs are renamed with suffixes of either 3 or 4. Also, allow qt3/qt4 installed under /usr/local to be searched and recognized appropriately.
* | | Merge topic 'fix-11575-add-wix-support-to-cpack'David Cole2012-12-053-1/+120
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a74bd47 CPack: Fix dashboard errors and warnings (#11575) ad0f735 CPack: Fix dashboard warnings (#11575) 0729ad4 CPack: Fix dashboard errors (#11575) 85baac1 CPack: Add a WiX Generator (#11575)
| * | | CPack: Add a WiX Generator (#11575)Nils Gladitz2012-12-033-1/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new CPack generator produces an *.msi installer file. Requires having the WiX Toolset installed in order to work properly. Download the WiX Toolset installer "WiX36.exe" here: http://wix.codeplex.com/releases/view/93929
* | | | Merge topic 'OpenBSD-patches'David Cole2012-12-057-1/+34
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 2f49b71 OpenBSD: Add path for Lua 5.1 4a015f7 OpenBSD: Add paths for Tcl/Tk 8.4/8.5 51c1119 OpenBSD: Add path for Freetype under X.org 6e7a345 OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDK 288f75e OpenBSD: Install shared libraries without executable permission
| * | | OpenBSD: Add path for Lua 5.1Amit Kulkarni2012-12-041-1/+1
| | | |
| * | | OpenBSD: Add paths for Tcl/Tk 8.4/8.5Amit Kulkarni2012-12-041-0/+8
| | | |
| * | | OpenBSD: Add path for Freetype under X.orgAmit Kulkarni2012-12-041-0/+3
| | | |
| * | | OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDKAmit Kulkarni2012-12-043-0/+18
| | | |
| * | | OpenBSD: Install shared libraries without executable permissionAmit Kulkarni2012-12-041-0/+4
| | | |
* | | | Merge topic 'qt4-include-as-system'David Cole2012-12-052-2/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 691ac05 Qt4: Add SYSTEM option to include_directories.
| * | | | Qt4: Add SYSTEM option to include_directories.Clinton Stimpson2012-12-032-2/+14
| |/ / / | | | | | | | | | | | | Thanks to Scott Bailey and Benjamin Kloster.
* | | | Merge topic 'ChangeSDLLinkLibraryOrder'David Cole2012-12-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 981629f Swap linking order of SDLmain and SDL (#0013769)
| * | | | Swap linking order of SDLmain and SDL (#0013769)Benjamin Eikel2012-12-021-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'fix-FindGettext-result' into releaseBrad King2012-11-261-2/+0
| |\ \ \
generated by cgit v0.12 at 2025-09-17 15:47:56 (GMT)