kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,107 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

20107 Commits

Author SHA1 Message Date
David Cole 3d0f1957d1 Merge topic 'ConfigHelperMinorCommentFix' 
8039bd0 CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments
 2012-12-11 13:43:59 -05:00
David Cole b575eadcda Merge topic 'add-timestamp-subcommands' 
12d87c0 CMake: Fix dashboard build errors and warnings
e28ce24 CMake: Fix dashboard test failure
354ecc1 CMake: Fix dashboard warnings
d842d90 CMake: Stylistic changes and documentation tweaks
711e2b3 CMake: Add TIMESTAMP subcommand to string and file commands
 2012-12-11 13:43:50 -05:00
David Cole d73c4057ed Merge topic 'OpenBSD-patches' 
f80ccac OpenBSD: Add paths for Qt3/Qt4
 2012-12-11 13:43:36 -05:00
Kitware Robot ab2b1f44f8 CMake Nightly Date Stamp 2012-12-11 00:01:14 -05:00
Kitware Robot 7ecaa4047b CMake Nightly Date Stamp 2012-12-10 00:01:04 -05:00
Kitware Robot 140ed91dd2 CMake Nightly Date Stamp 2012-12-09 00:01:06 -05:00
Kitware Robot 0cbe7dd1e3 CMake Nightly Date Stamp 2012-12-08 00:01:06 -05:00
Kitware Robot 2be87f8ff8 CMake Nightly Date Stamp 2012-12-07 00:01:10 -05:00
Alex Neundorf 8039bd0864 CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments 
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
 2012-12-06 22:24:43 +01:00
David Cole 12d87c0425 CMake: Fix dashboard build errors and warnings 
memset is not in std:: for VS6, and though quite silly, 0 is not a char
 2012-12-06 07:20:12 -05:00
Kitware Robot 8521a9e9ca CMake Nightly Date Stamp 2012-12-06 00:01:05 -05:00
David Cole e28ce2483d CMake: Fix dashboard test failure 
Eliminate the platform difference in calling stat. We call stat normally
in other places in the CMake code base just fine. Works everywhere we
work. Will hopefully also fix the Borland Continuous dashboard failure
that is occurring with respect to correctly measuring the modification
time of a freshly generated file.
 2012-12-05 15:16:22 -05:00
David Cole 354ecc1e1f CMake: Fix dashboard warnings 
...in the new file and string TIMESTAMP sub-commands
 2012-12-05 13:19:09 -05:00
Amit Kulkarni f80ccac158 OpenBSD: Add paths for Qt3/Qt4 
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.
 2012-12-05 13:09:43 -05:00
David Cole d842d90622 CMake: Stylistic changes and documentation tweaks 
...for the contributed file and string TIMESTAMP sub-commands.
 2012-12-05 10:39:11 -05:00
Nils Gladitz 711e2b3b5c CMake: Add TIMESTAMP subcommand to string and file commands 2012-12-05 10:39:10 -05:00
David Cole 2bb2745fa8 Merge topic 'fix-11575-add-wix-support-to-cpack' 
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)
 2012-12-05 10:31:05 -05:00
David Cole 799befa215 Merge topic 'OpenBSD-patches' 
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
 2012-12-05 10:30:56 -05:00
David Cole 41fe73a6bf Merge topic 'fix-13770-folders-w-vs11-express' 
7fa0f4b VS11: Allow using folders with the VS11 Express Edition (#13770)
 2012-12-05 10:30:48 -05:00
David Cole 7b910c0066 Merge topic 'qt4-include-as-system' 
691ac05 Qt4: Add SYSTEM option to include_directories.
 2012-12-05 10:30:40 -05:00
David Cole ba6e8264fe Merge topic 'ChangeSDLLinkLibraryOrder' 
981629f Swap linking order of SDLmain and SDL (#0013769)
 2012-12-05 10:30:31 -05:00
David Cole d208d1494f Merge topic 'windows-ce' 
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
 2012-12-05 10:30:16 -05:00
David Cole a4e0bba987 Merge topic 'avoid-undefined-behavior' 
6a6a6f3 libarchive: fixed undefined left shift with signed ints
 2012-12-05 10:30:06 -05:00
David Cole 4df341b041 Merge topic 'windows-ce-env-helper' 
dce54b1 Add command to generate environment for a Windows CE SDK
 2012-12-05 10:29:58 -05:00
David Cole 8a581696ef Merge topic 'safe-target-file-import' 
bf2ddce Generate an early-return guard in target Export files.
 2012-12-05 10:29:48 -05:00
David Cole 00dc0ce592 Merge topic 'ninja_launchers' 
9fc2e20 Ninja: fix usage of cldeps with ctest launchers
965358f enable CTEST_USE_LAUNCHERS with Ninja too
 2012-12-05 10:29:36 -05:00
Kitware Robot 7c2891daeb CMake Nightly Date Stamp 2012-12-05 00:01:05 -05:00
David Cole a74bd470a4 CPack: Fix dashboard errors and warnings (#11575) 
...revealed by the Nightly dashboard runs last night.

Use "size_t" instead of "std::size_t" so that it compiles with
Visual Studio 6, too.

Fix warnings about shadowed "tmp" local variable and ordering of
member variables vs. lines of code in the constructor initializer
list.
 2012-12-04 14:37:41 -05:00
Amit Kulkarni 2f49b71b65 OpenBSD: Add path for Lua 5.1 2012-12-04 08:36:07 -05:00
Amit Kulkarni 4a015f77e7 OpenBSD: Add paths for Tcl/Tk 8.4/8.5 2012-12-04 08:36:07 -05:00
Amit Kulkarni 51c1119469 OpenBSD: Add path for Freetype under X.org 2012-12-04 08:35:47 -05:00
Amit Kulkarni 6e7a3453b4 OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDK 2012-12-04 08:35:23 -05:00
Amit Kulkarni 288f75edee OpenBSD: Install shared libraries without executable permission 2012-12-04 08:25:33 -05:00
Kitware Robot 9d95dc3e23 CMake Nightly Date Stamp 2012-12-04 00:01:07 -05:00
David Cole 7fa0f4b870 VS11: Allow using folders with the VS11 Express Edition (#13770) 
Solution folders are supported as read-only in the VS11 Express
Edition, so do not prohibit their use just because we detect the
express edition (as we did in the VS10 generator).

Inspired-by: Paris
 2012-12-03 13:53:43 -05:00
David Cole ad0f73573f CPack: Fix dashboard warnings (#11575) 
Fix int vs. size_t conversion warnings that only showed up in
the 64-bit builds.
 2012-12-03 13:35:29 -05:00
David Cole 0729ad476c CPack: Fix dashboard errors (#11575) 
Use same technique here with UuidToString as already found in
cmGlobalVisualStudio7Generator::CreateGUID to avoid using a type
that is not defined on older systems... (VS 7.0 and Borland)
 2012-12-03 13:16:35 -05:00
Nils Gladitz 85baac1503 CPack: Add a WiX Generator (#11575) 
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
 2012-12-03 11:00:31 -05:00
Clinton Stimpson 691ac05d40 Qt4: Add SYSTEM option to include_directories. 
Thanks to Scott Bailey and Benjamin Kloster.
 2012-12-03 08:00:07 -07:00
Kitware Robot 538af16425 CMake Nightly Date Stamp 2012-12-03 00:01:06 -05:00
Benjamin Eikel 981629f701 Swap linking order of SDLmain and SDL (#0013769) 2012-12-02 14:32:47 +01:00
Kitware Robot cb15efc370 CMake Nightly Date Stamp 2012-12-02 00:01:05 -05:00
Kitware Robot 6e58a4c714 CMake Nightly Date Stamp 2012-12-01 00:01:08 -05:00
Brad King ae951af859 Merge topic 'fix-cpack-tests' 
587b7b6 Tests: Use the right path to CPack value for running CPack tests
 2012-11-30 10:36:29 -05:00
Brad King d8c0a40d05 Merge topic 'MinorFixFPHSA_13755' 
4809cad FPHSA: don't succeed if only checking for XX_FOUND (#13755)
 2012-11-30 10:36:21 -05:00
Brad King 2cb3b55100 Merge topic 'fix-watcom-test-timeout' 
2238505 Watcom: Avoid prompt from wmake about dll with no exports...
 2012-11-30 10:36:15 -05:00
Brad King 1be60d6dc7 Merge topic 'multiarch-include' 
da1d9ba Test find_path multiarch support (#13742)
b96f6fc Teach find_(path|file) about Linux multiarch (#13742)
 2012-11-30 10:35:59 -05:00
Patrick Gansterer 6b40e1ba3e VS: Ignore LIBC.lib when linking the CompilerId executables 
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.
 2012-11-30 15:17:50 +01:00
Patrick Gansterer 8e85822e2b VS: Add the entry point when compiling for WindowsCE 
Set the entry point to mainACRTStartup to make sure that main()
can be found when linking the application to check the compiler.
 2012-11-30 15:15:06 +01:00
Patrick Gansterer 5bf9fd8253 VS: Set the correct SubSystem when determinating the CompilerId 
Some WinCE linker only work when the subsystem is set to WINDOWSCE.
 2012-11-30 14:14:27 +01:00