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

24184 Commits

Author SHA1 Message Date
Brad King bbc358c3fc Merge branch 'master' into osx-init-early 
Resolve conflict in Source/cmGlobalGenerator.cxx by integrating
changes from both sides.
 2014-04-29 09:36:55 -04:00
Brad King 0cce556b5f Xcode: Use sysroot and deployment target to identify compiler 
Use CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET to set the Xcode
SDKROOT and MACOSX_DEPLOYMENT_TARGET build settings.  This is necessary
because some versions of Xcode select a different compiler based on
these settings.  We need to make sure the compiler identified during
language initialization matches what will be used for the actual build.
 2014-04-29 09:36:15 -04:00
Brad King 0200d0a9c4 OS X: Factor a Darwin-Initialize module out of Platform/Darwin 
Initialize variables CMAKE_OSX_SYSROOT, CMAKE_OSX_DEPLOYMENT_TARGET, and
CMAKE_OSX_ARCHITECTURES prior to enabling any languages.  This will
allow compiler identification to consider these values.
 2014-04-29 09:36:14 -04:00
Brad King 416761e35c Add platform-specific initialization step when enabling languages 
Create a Modules/CMakeSystemSpecificInitialize.cmake module loaded after
CMakeSystem.cmake but before per-language initialization.  Use it to
load an optional Platform/<os>-Initialize.cmake module.  This will be
useful to do per-platform initialization that does not depend on the
language and use the results when enabling specific languages.
 2014-04-29 09:36:14 -04:00
Kitware Robot c51d07d439 CMake Nightly Date Stamp 2014-04-29 00:01:08 -04:00
Kitware Robot bb1c41a085 CMake Nightly Date Stamp 2014-04-28 00:01:10 -04:00
Kitware Robot c8b76d58bd CMake Nightly Date Stamp 2014-04-27 00:01:09 -04:00
Kitware Robot 415b75ff37 CMake Nightly Date Stamp 2014-04-26 00:01:06 -04:00
Peter Kümmel 6a5bd7f0da Qt4: write moc parameter file only when content has changed 2014-04-25 18:24:56 +02:00
Brad King c2f27dadac Merge branch 'doc-singlehtml' into release 2014-04-25 08:43:07 -04:00
Brad King 6293d1ba76 Merge branch 'doc-full-help' into release 2014-04-25 08:43:00 -04:00
Brad King 478356e6d9 Restore --help-full option to output all help manuals 
This option was removed during conversion to the reStructuredText
documentation.  Restore it.  Process documentation starting at
Help/index.rst so that all manuals are included in the output.
 2014-04-25 08:41:31 -04:00
Kitware Robot 041dfea55b CMake Nightly Date Stamp 2014-04-25 00:01:10 -04:00
Brad King aaa6c8a6ce Merge branch 'master' into doc-singlehtml 
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
 2014-04-24 15:31:45 -04:00
Brad King faf291a9c4 Utilities/Sphinx: Add option to build 'singlehtml' format 
Add SPHINX_SINGLEHTML to enable the Sphinx 'singlehtml' builder.
 2014-04-24 15:23:27 -04:00
Brad King d64ee80d6b Merge branch 'release' 2014-04-24 09:27:06 -04:00
Brad King 20b46a09e3 Merge branch 'sphinx-python3' into release 2014-04-24 09:26:41 -04:00
Brad King 3c8226e590 Merge topic 'sphinx-python3' 
d55671ad Utilities/Sphinx: Fix cmake domain document removal with python3
 2014-04-24 09:24:59 -04:00
Brad King 9264983b82 Merge topic 'FindGTK2-X11' 
55f5ea7b FindGTK2: search for Fontconfig and X11 before using them
 2014-04-24 09:24:57 -04:00
Brad King 9b8685f7d0 Merge topic 'aix-streams' 
817db64c fix compile error on AIX/gcc-2.9 because of unknown std::stringstream
 2014-04-24 09:24:55 -04:00
Brad King d55671ad9d Utilities/Sphinx: Fix cmake domain document removal with python3 
In the domain clear_doc method, avoid removing entries from a dictionary
while iterating over it.  Instead accumulate a set of entries to remove
at the end.
 2014-04-24 09:04:52 -04:00
Kitware Robot 533d10e48c CMake Nightly Date Stamp 2014-04-24 00:01:10 -04:00
Rolf Eike Beer 55f5ea7b0e FindGTK2: search for Fontconfig and X11 before using them 2014-04-23 22:49:38 +02:00
Kitware Robot 608532fa2b CMake Nightly Date Stamp 2014-04-23 00:01:11 -04:00
Rolf Eike Beer 817db64c2c fix compile error on AIX/gcc-2.9 because of unknown std::stringstream 2014-04-22 22:21:31 +02:00
Brad King d3417a270f Merge branch 'release' 2014-04-22 12:54:58 -04:00
Brad King 72ab764582 Merge branch 'osx-CFBundle-info-plist' into release 2014-04-22 12:53:51 -04:00
Brad King 08a5b6b3cb Merge topic 'osx-CFBundle-info-plist' 
e4e76f28 Merge branch 'master' into osx-CFBundle-info-plist
149ce5db OS X: Fix Info.plist placement in a CFBundle
 2014-04-22 12:53:16 -04:00
Brad King e4e76f286c Merge branch 'master' into osx-CFBundle-info-plist 
Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
the side from 'master'.
 2014-04-22 12:51:55 -04:00
Tim Blechmann 149ce5db5e OS X: Fix Info.plist placement in a CFBundle 
Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
same root directory as the rest of the bundle.  Without this, Info.plist
was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
the target path was not generated correctly.
 2014-04-22 12:48:44 -04:00
Kitware Robot 2475acc497 CMake Nightly Date Stamp 2014-04-22 00:01:08 -04:00
Brad King b10083876c Merge topic 'feature-absence-hard-error' 
8d0b1cca Features: FATAL_ERROR on compilers with no recorded features.
447fbb3f Tests: Execute compile features tests unconditionally.
597bb72e Tests: Run RunCMake.target_compile_features unconditionally.
 2014-04-21 09:35:42 -04:00
Brad King 658cc11cf1 Merge topic 'fix-wix-cpack-crash' 
cb59f5da CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger
 2014-04-21 09:32:33 -04:00
Brad King ba83d84714 Merge topic 'ExternalData-missing-not-fatal' 
ccd29b9a ExternalData: Warn on missing file instead of failing
 2014-04-21 09:32:32 -04:00
Brad King a0972532b3 Merge topic 'CMP0052-docs' 
692228e4 Help: Link to cmake-buildsystem from CMP0052 docs.
e5e9b8e9 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
 2014-04-21 09:32:30 -04:00
Brad King bb891c2ef1 Merge topic 'internal-error-backtrace' 
3de4c295 cmake: Print C++ stack trace after INTERNAL_ERROR messages
 2014-04-21 09:32:28 -04:00
Brad King 464c8ab3a2 Merge topic 'autorcc-target-dir' 
33774ca2 QtAutogen: Put generated qrc files in a target-specific dir.
 2014-04-21 09:32:27 -04:00
Brad King fd4ee2d86f Merge topic 'FindGTK2_fix_bsd' 
d5a6069a FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes
ef9366b0 FindGTK2: Add /usr/X11R6/ to include paths
 2014-04-21 09:32:25 -04:00
Brad King ad8041e335 Merge topic 'UseSWIG-guess_module_name' 
2c96192f UseSWIG: Revise and format documentation
e147c5c5 UseSWIG: Detect module name from interface file (#10080)
 2014-04-21 09:32:23 -04:00
Daniele E. Domenichelli d5a6069a12 FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes 2014-04-21 09:28:55 -04:00
Julien Schueller 2c96192f4c UseSWIG: Revise and format documentation 
Also add some documentation of SWIG_MODULE_NAME.
 2014-04-21 09:23:41 -04:00
Julien Schueller e147c5c555 UseSWIG: Detect module name from interface file (#10080) 
If no SWIG_MODULE_NAME is specified explicitly and the .i file exists,
scan it for the module name declaration.
 2014-04-21 09:22:57 -04:00
Kitware Robot c770d404d2 CMake Nightly Date Stamp 2014-04-21 00:01:06 -04:00
Kitware Robot bae9452200 CMake Nightly Date Stamp 2014-04-20 00:01:06 -04:00
Kitware Robot 1a4eb50946 CMake Nightly Date Stamp 2014-04-19 00:01:22 -04:00
Nils Gladitz cb59f5da97 CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger 
Without the fix CPack will crash when the cmWIXPatch class tries to issue
any diagnostics.
 2014-04-18 22:45:30 +02:00
Brad King 3970b5de0f Merge branch 'release' 2014-04-18 13:17:29 -04:00
Stephen Kelly 33774ca201 QtAutogen: Put generated qrc files in a target-specific dir. 2014-04-18 16:41:13 +02:00
Brad King 046ee6d36d Merge branch 'release' 2014-04-18 09:35:49 -04:00
Brad King 2b7f70cdcb Merge branch 'sphinx-python3' into release 2014-04-18 09:10:13 -04:00