Commit Graph

15433 Commits

Author SHA1 Message Date
Brad King dacc47853d Merge topic 'vs-project-groups'
fd3249e New USE_FOLDERS property OFF by default. (#3796)
2010-10-05 15:31:49 -04:00
Brad King 51047564bf Merge topic 'vs10-custom-comments'
2596e16 VS10: Encode custom command comments for echo (#11283)
2010-10-05 15:31:03 -04:00
Brad King cb314e250b Merge topic '11279'
aca758b Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
2010-10-05 15:30:32 -04:00
Brad King b653e8b6e7 Merge topic 'dev/test-for-bug-11230'
96a335f XCode generation should fail if lang isn't known
d3a8943 Fix which string is checked for in the test
220c5dc Add test that CMake errors with empty libs
2010-10-05 15:30:10 -04:00
Brad King 54a3bf001c Merge topic 'vs10-empty-target'
448661f VS10: Skip targets with no linker language (#11230)
2010-10-05 15:29:20 -04:00
Brad King 46bc165c36 Merge topic 'fix_custom_commands_with_intdir_vs10'
3d68dd2 Fix for bug #11274, VS10 custom commands that create files in INTDIR fix.
2010-10-05 15:28:45 -04:00
Brad King 111f81c930 Merge topic 'fix_hpux_test_failure'
5253206 Add a new line to the end of the generated main.cxx for the hpux compiler.
2010-10-05 15:26:38 -04:00
Brad King b38297d2d1 Merge topic 'vs-load-Windows-ifort'
20f4973 Reset platform/compiler info status for each language
2010-10-05 15:21:25 -04:00
Alex Neundorf 9072535f83 CodeBlocks Generator: Do not omit files in the project file listing.
The CodeBlocks generator used to omit files that were in siblings directories.
Though that filters out a few files that could be argued aren't of interest
to the user, it also potentialy hides files that are relevant to the user.

Patch by Daniel Teske.

Alex

See: http://bugreports.qt.nokia.com/browse/QTCREATORBUG-2250 for an example.
2010-10-05 21:16:17 +02:00
KWSys Robot d0d8f029ab KWSys Nightly Date Stamp 2010-10-05 00:10:31 -04:00
James Bigler 6916f8dba7 Allow -g3 for CUDA v3.0+.
In versions of the CUDA toolkit previous to version 3.0 the use of -g3 would cause
compilation errors.  This was fixed in version 3.0.
2010-10-04 16:42:21 -06:00
James Bigler 1df8516c0e Fix for bug 0011263.
Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.
2010-10-04 16:11:08 -06:00
KWSys Robot 5eca3dd0f0 KWSys Nightly Date Stamp 2010-10-04 00:10:06 -04:00
Eric NOULARD 4a4a53f3dd CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
merge patch from Frank Stappers
2010-10-03 23:29:34 +02:00
KWSys Robot ef4263aad7 KWSys Nightly Date Stamp 2010-10-03 00:10:04 -04:00
David Cole fd3249e11a New USE_FOLDERS property OFF by default. (#3796)
Visual Studio Express editions do not support solution folders,
so default behavior should be as if USE_FOLDERS global property
is OFF.

Also, allow folder names to be the same as target names: internally,
use a prefix to distinguish folder GUIDs from target GUIDs. Add
a target and folder with the same name in the ExternalProject
test to exercise this code.

For CMake itself, provide a new option CMAKE_USE_FOLDERS that
defaults to ON so that Visual Studio users get a nicely organized
CMake project. Express edition users will have to turn off the
CMAKE_USE_FOLDERS option in order to build CMake in the VS Express
IDE.
2010-10-02 14:31:02 -04:00
KWSys Robot 2488c343f1 KWSys Nightly Date Stamp 2010-10-02 00:10:36 -04:00
Brad King 2596e16c8f VS10: Encode custom command comments for echo (#11283)
VS10 uses MSBuild underneath.  The <Message></Message> CDATA are just
appended to "echo" and executed as a single command.  Encode the message
such that it can be passed to echo.  Convert newlines to tabs since they
cannot be printed this way.
2010-10-01 16:12:00 -04:00
KWSys Robot d69b129481 KWSys Nightly Date Stamp 2010-10-01 00:10:39 -04:00
Philip Lowman aca758bf29 Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
Thanks to Aaron C. Meadows for the patch.
2010-09-30 21:24:28 -04:00
Ben Boeckel 96a335fd8d XCode generation should fail if lang isn't known 2010-09-30 14:54:20 -04:00
Ben Boeckel d3a89432fd Fix which string is checked for in the test
GNU Makefiles have an extra line that Visual Studio doesn't output.
2010-09-30 11:39:26 -04:00
Ben Boeckel 220c5dc45a Add test that CMake errors with empty libs
When the library language cannot be determined, make sure CMake errors,
not segfaults (bug #11230)
2010-09-30 11:01:35 -04:00
Brad King 448661fbe5 VS10: Skip targets with no linker language (#11230)
In targets with no non-header files the linker language cannot be
determined.  Since the target project file cannot be generated at all in
this case, give up as soon as it is detected.  Otherwise the generation
code may try to run with uninitialized information.
2010-09-30 08:48:38 -04:00
KWSys Robot 4e137de7b1 KWSys Nightly Date Stamp 2010-09-30 00:10:39 -04:00
Bill Hoffman 3d68dd230d Fix for bug #11274, VS10 custom commands that create files in INTDIR fix. 2010-09-29 17:02:04 -04:00
Bill Hoffman 5253206798 Add a new line to the end of the generated main.cxx for the hpux compiler.
Some HPUX compilers give this error: Error 690: "/home/cport/Dashboards/My Tests/CMake-build/Tests/CheckCompilerRelatedVariables/main.cxx", line 1 # Nonempty source files must end with a newline that is not preceded by a backslash.
2010-09-29 14:46:45 -04:00
Brad King da5c8953b7 Merge topic 'xcode-generator-trailing-whitespace'
a2bbe4b Remove trailing whitespace from Xcode generator source
2010-09-29 09:30:20 -04:00
Brad King a2bbe4bef9 Remove trailing whitespace from Xcode generator source
Reverting abandoned topic xcode_source_group_fix_7932 left this source
slightly different due to trailing whitespace removal on some lines.
Remove all trailing whitespace from the file to make it consistent.
2010-09-29 08:38:18 -04:00
KWSys Robot 0f6b3a0059 KWSys Nightly Date Stamp 2010-09-29 00:10:08 -04:00
Alex Neundorf b01184022b Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
This is to avoid getting an (older) copy of FPHSA.cmake which is
e.g. installed with KDE 4.5.0 and 4.5.1.

Alex
2010-09-28 22:30:31 +02:00
Alex Neundorf 41e4f1a210 Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
Comes with a simple test and docs.

Alex
2010-09-28 22:10:47 +02:00
Alex Neundorf f9fc79cac5 Remove trailing whitespace
Alex
2010-09-28 21:44:22 +02:00
Brad King d24b8acc1a Merge topic 'cmake-guiRememberAdvancedCheckbox'
3d13502 Make cmake-gui remember whether the "Advanced" checkbox was checked or not
8e8acb7 -remove trailing whitespace
2010-09-28 14:06:31 -04:00
Brad King dbf7664c99 Merge topic 'PutRequiredVersionInDetailMessageInFPHSA'
567ac0b Also store the required version number in the details message.
2010-09-28 14:05:15 -04:00
Brad King 3398ec7d6f Merge topic 'vs10-object-intdir'
7ef659f VS10: Use $(IntDir) for per-source output directory (#11270)
2010-09-28 14:04:48 -04:00
Brad King e66c12a265 Merge topic 'python_module_prefix_suffix'
d36c16a Set the module prefix, updated Windows suffix.
2010-09-28 14:04:24 -04:00
Brad King c86d677fe0 Merge topic 'findqt4-cross-compile'
25931ae Fix regression in cross-compile patches with finding Qt libs.
2010-09-28 14:03:37 -04:00
Brad King 126158f046 Merge topic 'fixAbsoluteDestHandlingRegression'
225abc5 InstallGen/CPack  fix handling absolute installed file regression
2010-09-28 14:02:44 -04:00
Brad King c0665ca795 Merge topic 'DescriptionsForFeatureSummaryALL'
b935f00 Close ENDFUNCTION() properly with the same name as FUNCTION()
07bca48 Set a default DESCRIPTION if none is given for ALL mode of feature_summary()
d5b2915 APPEND and not-APPEND mode of feature_summary() were swapped
2010-09-28 14:02:19 -04:00
Brad King 20f49730ae Reset platform/compiler info status for each language
In each CMake<lang>Information.cmake file we use an _INCLUDED_FILE
variable to track whether a compiler information file has been loaded.
Reset this variable for each language.

This fixes Fortran under VS generators with the Intel plugin.
Previously the variable would be left set true from C and C++ and then
Fortran would not load old-style files like Platform/Windows-ifort.
2010-09-28 09:49:20 -04:00
KWSys Robot 5efe30791b KWSys Nightly Date Stamp 2010-09-28 00:10:03 -04:00
Alex Neundorf 567ac0bb1f Also store the required version number in the details message.
This way the success/failure message of FPHSA() is also printed again
if the required version is changed.

Alex
2010-09-27 22:08:14 +02:00
Brad King 7ef659fcc3 VS10: Use $(IntDir) for per-source output directory (#11270)
The original implementation of this generator accidentally used
"$(Configuration)/" for source-specific object file names.  Correct it
to use "$(IntDir)/" just like the generators for all previous VS
versions.  The target-wide output directory is "$(IntDir)/" already.
2010-09-27 08:37:00 -04:00
KWSys Robot 993cfc9406 KWSys Nightly Date Stamp 2010-09-27 00:10:04 -04:00
KWSys Robot c928751d27 KWSys Nightly Date Stamp 2010-09-26 00:10:04 -04:00
KWSys Robot f42bae0bd5 KWSys Nightly Date Stamp 2010-09-25 00:10:04 -04:00
David Gobbi d36c16a760 Set the module prefix, updated Windows suffix.
Set the Python module prefix to PYTHON_MODULE_PREFIX, and changed the
suffix on Windows to .pyd as .dll is officially deprecated.
2010-09-24 15:04:24 -04:00
KWSys Robot 7d243b9695 KWSys Nightly Date Stamp 2010-09-24 00:10:36 -04:00
Clinton Stimpson 25931ae10e Fix regression in cross-compile patches with finding Qt libs.
If a Qt installation is in CMAKE_PREFIX_PATH and a
QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation,
prefer finding libs in the latter Qt installation.
2010-09-23 16:50:09 -06:00