summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* ExternalProject: Propagate the generator toolsetBrad King2013-02-071-0/+11
| | | | | | | | When the CMAKE_GENERATOR option is given to ExternalProject_Add, look also for option CMAKE_GENERATOR_TOOLSET to select the value of the cmake "-T" command-line flag. When no CMAKE_GENERATOR option is given explicitly then use the current project's CMAKE_GENERATOR_TOOLSET (since we already use its CMAKE_GENERATOR).
* Xcode: Implement generator toolset selection (#9831, #13802)Brad King2013-02-072-0/+6
| | | | | Implement generator toolset selection (cmake -T) for Xcode > 2.0 by adding the GCC_VERSION build setting to project files.
* Merge branch 'xcode-duplicate-flags-13354' into generator-toolsetBrad King2013-01-3125-66/+288
|\
| * 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.
* | | | ExternalProject: Simplify CMake command line generationBrad King2013-01-311-4/+5
|/ / / | | | | | | | | | | | | Append the source directory to the command line option in a separate step instead of duplicating it with each possible generator.
* | | 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
| |\ \ \
* | \ \ \ Merge topic 'windows-ce'David Cole2012-12-054-11/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b40e1b VS: Ignore LIBC.lib when linking the CompilerId executables 8e85822 VS: Add the entry point when compiling for WindowsCE 5bf9fd8 VS: Set the correct SubSystem when determinating the CompilerId
| * | | | | VS: Ignore LIBC.lib when linking the CompilerId executablesPatrick Gansterer2012-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Windows CE linkers want to link against LIBC.lib, but can not find them. Since they are not required we can simply ignore it.
| * | | | | VS: Add the entry point when compiling for WindowsCEPatrick Gansterer2012-11-304-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the entry point to mainACRTStartup to make sure that main() can be found when linking the application to check the compiler.
| * | | | | VS: Set the correct SubSystem when determinating the CompilerIdPatrick Gansterer2012-11-302-1/+4
| | |_|_|/ | |/| | | | | | | | | | | | | Some WinCE linker only work when the subsystem is set to WINDOWSCE.
* | | | | Merge topic 'ninja_launchers'David Cole2012-12-051-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | 9fc2e20 Ninja: fix usage of cldeps with ctest launchers 965358f enable CTEST_USE_LAUNCHERS with Ninja too
| * | | | enable CTEST_USE_LAUNCHERS with Ninja tooMathias Gaunard2012-11-301-1/+1
| |/ / /
* | | | FPHSA: don't succeed if only checking for XX_FOUND (#13755)Alex Neundorf2012-11-291-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue #13755. FPHSA(XX DEFAULT_MSG XX_FOUND) always succeeded due to the way how the XX_FOUND variable was set. It was preset to TRUE, and then reset to FALSE if something was missing (...which had the effect that XX_FOUND itself was already preset when FPHSA checked whether XX_FOUND is set) Now XX_FOUND is unset first, and only later on set to TRUE. Alex
* | | Merge topic 'windows-ce'Brad King2012-11-285-11/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a1006e VS: Added "Deploy" at project configuration for WindowsCE targets 40c36c9 VS: Make DetermineCompilerId working with WinCE too 038df9e VS: Allow setting the name of the target platform 6fe4fcb VS: Add parser for WCE.VCPlatform.config to read WinCE platforms 2118a20 VS: Support setting correct subsystem and entry point for WinCE 6920fed VS: Change variable type of Name from const char* to string 102521b VS: Change variable type of ArchitectureId from const char* to string 332dc09 VS: Add static method to get the base of the registry d41d4d3 VS: Add CMAKE_VS_PLATFORM_NAME definition to cmMakefile 14861f8 VS: Remove TargetMachine for linker when checking compiler id
| * | | VS: Make DetermineCompilerId working with WinCE tooPatrick Gansterer2012-11-275-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Add a dummy mainCRTStartup() function, since the linker searches for it instead of main() and set the CMAKE_SYSTEM_* variables depending on the MSVC_C_ARCHITECTURE_ID and CMAKE_VS_WINCE_VERSION variables.
| * | | VS: Add CMAKE_VS_PLATFORM_NAME definition to cmMakefilePatrick Gansterer2012-11-261-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | When adding more platforms to the Visual Studio generators a simple regular expressing can not handle all cases anymore. This new define holds the name of the Visual Studio target platform.
| * | | VS: Remove TargetMachine for linker when checking compiler idPatrick Gansterer2012-11-202-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | If the TargetMachine isn't defined the linker will choose the correct target depending on the input file. This helps us later with additional compiler platforms for WinCE.
generated by cgit v0.12 at 2025-01-11 22:13:08 (GMT)