summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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.
* | Merge topic 'winflexbison'Brad King2012-11-272-5/+7
|\ \ | | | | | | | | | | | | | | | df29336 FindFLEX: Add support for the Win flex-bison distribution e593f8a FindBISON: Add support for the Win flex-bison distribution
| * | FindFLEX: Add support for the Win flex-bison distributionPatrick Gansterer2012-11-261-4/+6
| | | | | | | | | | | | Search for win_flex too and improve version parsing.
| * | FindBISON: Add support for the Win flex-bison distributionPatrick Gansterer2012-11-261-1/+1
| |/ | | | | | | Search for win_bison too.
* | Merge topic 'FindBullet-windows-configs'Brad King2012-11-271-0/+2
|\ \ | | | | | | | | | | | | f180b24 FindBullet: Search in per-config dirs on Windows (#13738)
| * | FindBullet: Search in per-config dirs on Windows (#13738)Alan Witkowski2012-11-261-0/+2
| |/ | | | | | | Bullet for windows installs in these per-config paths.
* | Merge topic 'fix-12437-remove-ridiculously-large-default-stack-size-arg'Brad King2012-11-272-3/+3
|\ \ | | | | | | | | | | | | 51af1da CMake: Remove "/STACK:10000000" from default linker flags (#12437)
| * | CMake: Remove "/STACK:10000000" from default linker flags (#12437)David Cole2012-11-232-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | Modern apps that use multiple threads do NOT want 10 Megabytes of RAM per thread being used for each thread's stack... Just leave off the /STACK: argument, and let the compiler use a reasonable default value for the stack size. If existing single-threaded apps require the /STACK: argument because they do need a very large stack size, they can add the flag in their own CMakeLists files.
* | Merge topic 'cpack-nsis64-patches'Brad King2012-11-271-2/+5
|\ \ | | | | | | | | | | | | | | | 6ff730a CPack/NSIS: Add support for 64-bit NSIS (#13203) 51da766 CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)
| * | CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)David Golub2012-11-201-2/+5
| | |
* | | Merge topic 'fix-FindGettext-result'Brad King2012-11-271-2/+0
|\ \ \ | |_|/ |/| | | | | | | | a7be253 FindGettext: fix overwriting result with empty variable (#13691)
| * | FindGettext: fix overwriting result with empty variable (#13691)Rolf Eike Beer2012-11-261-2/+0
| | | | | | | | | | | | | | | Remove stray line left by commit 656ab19b (FindGettext: remove code duplicating FPHSA checks, 2012-09-08).
* | | MSVC: Drop default use of /Zm1000 for VS >= 7.1Brad King2012-11-161-1/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | From the option documentation of VS >= 7.1: "In earlier versions of Visual C++, the compiler used several discrete heaps, and each had a finite limit. Currently, the compiler dynamically grows the heaps as necessary up to a total heap size limit, and requires a fixed-size buffer only to construct precompiled headers. Consequently, the /Zm compiler option is rarely necessary." http://msdn.microsoft.com/en-us/library/bdscwf1c.aspx Suggested-by: Adam Moss <adam@broadcom.com>
* | Merge topic 'only-git-fetch-when-necessary'Brad King2012-11-131-5/+78
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a41d3a4 ExternalProjectUpdateTest: Only support Git 1.6.5 and greater. de760c1 ExternalProject: Verify when a fetch occurs during update test. 0a34433 ExternalProject: Make sure the ExternalProjectUpdate setup is available. 9b66c8f ExternalProject: Always do a git fetch for a remote ref. 2619f4d ExternalProject: Add tests for UPDATE_COMMAND. 378aa12 ExternalProject: Do smoke tests for Git Tutorial builds. d075829 ExternalProject: Only run 'git fetch' when required.
| * | ExternalProject: Always do a git fetch for a remote ref.Matt McCormick2012-11-131-1/+14
| | | | | | | | | | | | | | | Remote git refs always require a git fetch, because the remote may move around where the ref points.
| * | ExternalProject: Only run 'git fetch' when required.Matt McCormick2012-11-031-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current default update step for Git under the ExternalProject_Add command, a 'git fetch' is always performed, followed by a 'git checkout' and 'git submodule update --recursive'. However, a 'git fetch' can be time consuming and requires a network connection. To save time, we look at the current checked out hash, and only perform the fetch if required. This is performed in a CMake script so we can handle the conditional logic in a cross platform manner.
* | | Merge topic 'osx-bad-sdk-xcode-3.2.6'Brad King2012-11-131-0/+17
|\ \ \ | | | | | | | | | | | | | | | | 720d790 OS X: Warn about known SDK breakage by Xcode 3.2.6
| * | | OS X: Warn about known SDK breakage by Xcode 3.2.6Brad King2012-11-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 3.2.6 is known to break the SDK Library/Frameworks layout. Detect and warn about this case to tell users to fix their system. Reported-by: Matthew Brett <matthew.brett@gmail.com>
| * | | Merge branch 'osx-sysroot-cleanup' into releaseBrad King2012-11-061-0/+1
| |\ \ \
| * \ \ \ Merge branch 'fix-FindSDL-paths' into releaseBrad King2012-11-061-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-PathScale-compiler-id' into releaseBrad King2012-11-062-16/+16
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'MakeSquish4Work'Brad King2012-11-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b58fd65 Squish: fix new squish_v4_add_test() macro
| * | | | | | | Squish: fix new squish_v4_add_test() macroAlex Neundorf2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OUTPUT_NAME target property only returns something if it has been explicitely set. So use LOCATION, and extract the filename from that. Alex
* | | | | | | | Merge topic 'MakeSquish4Work'Brad King2012-11-064-29/+234
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a0ffa6 Squish: add support for squish 4 (#9734) 2ae9d03 Squish: use ${CMAKE_CURRENT_LIST_DIR} 53c42cb Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bit daf1c4d Squish: find executables also under Windows b878cd6 Squish: use FPHSA 3fe2bc6 Squish: detect version
| * | | | | | | Squish: add support for squish 4 (#9734)Alex Neundorf2012-11-054-20/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Squish 4.x. The changes are basically what is attached to http://public.kitware.com/Bug/view.php?id=9734. When adding a test for squish 4.x, use squish_v4_add_test(). Alex
| * | | | | | | Squish: use ${CMAKE_CURRENT_LIST_DIR}Alex Neundorf2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ${CMAKE_CURRENT_LIST_DIR} instead of constructing the dir from pieces. Alex
| * | | | | | | Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bitAlex Neundorf2012-11-051-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is still a wrapper macro squish_add_test(), but this now mentions that you should use squish_v3_add_test() instead. Also, the docs for the macro were just wrong. They are at least correct now, but still hard to understand (I don't have squish 3 around, so I can't improve them). Alex
| * | | | | | | Squish: find executables also under WindowsAlex Neundorf2012-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required according to Volker Krause (see http://public.kitware.com/Bug/view.php?id=9734) Alex
| * | | | | | | Squish: use FPHSAAlex Neundorf2012-11-041-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | Squish: detect versionAlex Neundorf2012-11-041-0/+19
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'TI_DSP_Compiler'Brad King2012-11-063-0/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65e9bbe Add support for Texas Instruments DSP compiler (#12405)
| * | | | | | | Add support for Texas Instruments DSP compiler (#12405)Alex Neundorf2012-11-043-0/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for the cl6x compiler from TI, which is used for TI DSPs. The toolchain can be downloaded for free for Linux and Windows. Alex
* | | | | | | Merge topic 'fix-module-includes'Brad King2012-11-0653-65/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ebf74b Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
| * | | | | | | Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()Rolf Eike Beer2012-11-0453-65/+65
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a lots of warnings, e.g. in the FindModulesExecuteAll test. If the installed version on the system is rather old this may even lead to bugs, e.g. https://bugs.gentoo.org/show_bug.cgi?id=436540
* | | | | | | Merge topic 'deb-rpm-all_components_in_one'Brad King2012-11-062-8/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e2694 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"
| * | | | | | | CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"Clinton Stimpson2012-11-062-8/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'fix-13600-better-framework-regex'Brad King2012-11-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89256e0 BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
| * | | | | | | BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)David Cole2012-10-231-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some frameworks might be built with the library right at the root of the framework rather than down in a versioned sub-folder with a symlink at the root. Make one of the slashes in the REGEX optional so BundleUtilities can still properly work with such frameworks ... even if they are weird. ;-) Thanks to Tobias Hieta for the bug report and for trying out the fix before I pushed this commit.
* | | | | | | Merge topic 'osx-sysroot-cleanup'Brad King2012-11-061-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 15f5764 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
| * | | | | | OS X: Fix default CMAKE_OSX_SYSROOT with deployment targetBrad King2012-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when one is needed. However, the change forgot that we require a sysroot when a deployment target is requested. Teach Darwin.cmake to choose a default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. Reported-by: Matthew Brett <matthew.brett@gmail.com> Reported-by: Bradley Giesbrecht <pixilla@macports.org>
* | | | | | | Merge topic 'fix-FindSDL-paths'Brad King2012-11-061-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 7cb5173 FindSDL: Restore accidentally dropped search paths (#13651)
| * | | | | | FindSDL: Restore accidentally dropped search paths (#13651)Brad King2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS that are set by default, 2012-09-04) accidentally dropped some search paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed to search paths that were previously hard-coded. Reported-by: Gino van den Bergen <gino@dtecta.com>
* | | | | | | Merge topic 'fix-PathScale-compiler-id'Brad King2012-11-062-16/+16
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | fccf19f Fix PathScale compiler id for Clang-based upstream
| * | | | | | Fix PathScale compiler id for Clang-based upstreamBrad King2012-11-052-16/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream PathScale now uses Clang as its front-end. Test for __PATHCC__ before __clang__. Reported-by: C. Bergström <cbergstrom@pathscale.com>
* | | | | | Merge topic 'fix-openssl-win'Brad King2012-11-061-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | 4a4c0ee FindOpenSSL: also find the non-MD debug libraries for MSVC 894b775 FindOpenSSL: fix library selection on Windows (#13645)
| * | | | FindOpenSSL: also find the non-MD debug libraries for MSVCRolf Eike Beer2012-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | We already search for them in release mode.