Commit Graph

15411 Commits

Author SHA1 Message Date
Brad King 913437da72 Merge topic 'fix-9992'
2f98dac Correct CMAKE_INSTALL_PREFIX value for Win64 apps (#9992)
2010-09-14 13:10:48 -04:00
Brad King 5dfa48c8c5 Merge topic 'lazy-query-cdash'
ffda17d We shouldn't ask CDash for its version info until/unless we actually need it.
2010-09-14 13:09:58 -04:00
Brad King 1ae9832988 Merge topic 'multi-v-single-configuration'
b06fb16 No CMAKE_CONFIGURATION_TYPES in single-config generators (#10202)
2010-09-14 13:07:59 -04:00
David Cole 9b4ab06c2c Avoid CustomCommand test failure on VS71 (#9963)
The new first arg in the test is the critical one
to prove that the new NMake specific code works.
The additional colons in the middle of the arg
stream work fine everywhere else, but not on
dash1.kitware with Visual Studio 7.1. Just avoid
the failure for now by removing the unnecessary
new args from the test.
2010-09-14 10:36:43 -04:00
Bill Hoffman 7d148d8036 Fix the name of the variable being tested. 2010-09-14 09:30:39 -04:00
KWSys Robot becc11f72f KWSys Nightly Date Stamp 2010-09-14 00:10:28 -04:00
Brad King a6b5ead62f Report missing source files with context of target
Previously we reported only the CMakeLists.txt file in the directory
that adds the target.
2010-09-13 16:17:20 -04:00
David Cole ed37fc3ea3 VS2010: Set IntDir for utility and global targets.
VS2010 uses IntDir as the location for writing log files for
what happens during custom build steps. With no IntDir settings,
all ExternalProject usage within the same CMakeLists.txt file
would result in multiple utility targets all trying to use the
same custom build log files.

With parallel builds, they would try to use them simultaneously
and result in file access errors, preventing the builds from
completing successfully.

Now each utility target has its own IntDir setting, and so, its
own custom build rule log files.
2010-09-13 15:22:15 -04:00
Bill Hoffman 297be5b524 add next as an orgin based branch, and not a tag. 2010-09-13 11:30:23 -04:00
Marcel Loose 80bad29af6 Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOT 2010-09-13 13:13:12 +02:00
KWSys Robot f3bc219adb KWSys Nightly Date Stamp 2010-09-13 00:10:04 -04:00
David Cole 9d2e6489bf No extra spaces in CustomCommand test (#9963)
The nightly dashboard showed that the following
platforms had difficulties dealing with "bin dir"
and/or "check command line" as directory and
file names:

  AIX
  Borland 5.5, 5.6 and 5.8
  IRIX
  NMake 6.0
  OpenBSD
  VS 7.1
  Watcom

Re-visit later, after the release, to use spaces
in the bin dir and in the target name where possible.
2010-09-12 05:01:35 -04:00
KWSys Robot 3665e69bc6 KWSys Nightly Date Stamp 2010-09-12 00:10:03 -04:00
KWSys Robot c36f501a64 KWSys Nightly Date Stamp 2010-09-11 00:10:04 -04:00
David Cole 269a4b876a Enable calling commands with : in argv[1] (#9963)
The solution seems hackish, but it works: for
NMake only, prepend a no-op command before each
real command that begins with ".

This is really a work-around for an NMake problem.
When a command begins with ", nmake truncates the
first argument to the command after the first :
in that arg. It has a parsing problem.

Workaround..., hackish..., but it should solve
the issue for #9963 and its related friends.

Also, modify the CustomCommand test to replicate
the problem reported in issue #9963. Before the
NMake specific code change, the test failed.
Now, it passes. Ahhhhhh.
2010-09-10 17:55:45 -04:00
Bill Hoffman 187976b1f3 Fix release scripts to be able to build releases from tags. 2010-09-10 15:41:27 -04:00
Brad King 9d21281b7d Fix line-too-long style errors 2010-09-10 14:42:09 -04:00
Brad King 86025d3a38 file(DOWNLOAD): Fix error message formatting
The SetError method automatically starts the message with the name of
the command.  Fix up calls to it so that we get "file DOWNLOAD..."
instead of "file FILE(DOWNLOAD ...".  Also reduce length of long lines
containing these calls.
2010-09-10 14:35:07 -04:00
James Bigler 4f0636e979 Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+.
CUDA 3.2 on Windows systems changed the layout of the library paths.  This adds the extra
directories needed to locate the new files.

I also explicitly disable emulation mode for CUDA 3.1+.  This feature was deprecated in
3.0 and ultimately removed in 3.1.  The script errors out if CUDA_BUILD_EMULATION is
turned on.  I didn't want to ignore emulation mode (even with a warning - which most
people may not even see) and have users confused as to why it wasn't working.
2010-09-10 11:48:38 -06:00
Bill Hoffman 92c082b1c9 Add a fix for the inline keyword on the osf os. 2010-09-10 13:37:02 -04:00
Brad King c7aa38ff39 bootstrap: Honor CFLAGS during "make" test (#10545) 2010-09-10 11:39:43 -04:00
Brad King 1a0c166a26 Store direct dependencies in solutions for VS >= 8
Since commit bc43b0f2 (Do not link library dependencies in VS solutions,
2009-10-20) CMake disables for VS >= 8 linking of a target to libraries
that happen to be listed as solution-level dependencies.  Therefore we
can list the direct dependencies of each target in the solution file and
let VS handle transitive dependencies automatically.
2010-09-10 09:12:03 -04:00
Brad King b9c41813d2 libarchive: Fix purposeful crash
Dereferencing a 0-pointer is undefined behavior, not a deterministic
crash.  Use a 1-pointer instead.  This also avoids a warning by Clang
about the undefined behavior.
2010-09-10 09:00:48 -04:00
Brad King 87fde60563 Suppress -Wcast-align in curl and bzip2
Trust upstream developers of third-party code.
2010-09-10 09:00:48 -04:00
Brad King f2b4a46677 KWSys: Suppress -Wcast-align warning in MD5.c
The code does contain a cast that increases alignment but only in a
conditional that verifies the input is sufficiently aligned.
2010-09-10 09:00:02 -04:00
KWSys Robot de346204b8 KWSys Nightly Date Stamp 2010-09-10 00:10:08 -04:00
David Cole e79e412e70 VS2010: Honor PROJECT_LABEL target property (#10611) 2010-09-09 16:44:30 -04:00
David Cole 20a6f6cf7a Use QUIET to avoid Java status messages.
CMake devs mostly do not care when Java is found successfully.
2010-09-09 15:41:53 -04:00
David Cole 666f328858 Preserve timestamps on files on tar extract.
Conversion to libarchive changed the behavior of
cmake -E tar xzf. This commit fixes that oversight.
2010-09-09 12:57:14 -04:00
David Cole 2eab3b2cbb Revert commit: CMake: quote ':' in Windows NMake Makefiles (#9963) -- it was not the right fix and caused mucho other problemo 2010-09-09 12:40:04 -04:00
David Cole 2f98dac486 Correct CMAKE_INSTALL_PREFIX value for Win64 apps (#9992)
The default value for CMAKE_INSTALL_PREFIX should be
based on what architecture the built targets are, not
what architecture CMake itself is.

This fix merely guesses better what the built targets
architecture is. It still may guess incorrectly in some
cases. For those cases, it will have to be up to build
scripts and developers on projects to pass in a correct
value for CMAKE_INSTALL_PREFIX with -D on the command line
or via 'force cache value' logic in CMakeLists.txt files.
2010-09-09 08:32:42 -04:00
KWSys Robot 42dbb43294 KWSys Nightly Date Stamp 2010-09-09 00:10:04 -04:00
David Cole fcbdd3129e CMake: quote ':' in Windows NMake Makefiles (#9963) 2010-09-08 18:50:03 -04:00
Zach Mullen ffda17d9ef We shouldn't ask CDash for its version info until/unless we actually need it. 2010-09-08 15:14:42 -04:00
Brad King b06fb16684 No CMAKE_CONFIGURATION_TYPES in single-config generators (#10202)
Factor out reading of CMAKE_CONFIGURATION_TYPES and CMAKE_BUILD_TYPE
into cmMakefile::GetConfigurations.  Read the former only in
multi-config generators.
2010-09-08 14:54:49 -04:00
Bill Hoffman bd56626a4a Fixes for the OSF operating system build. 2010-09-08 14:50:14 -04:00
Brad King f444b9555f Merge topic 'allow_upper_case_cpp_and_others'
7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work.
ba0a890 Only test for .CPP on Microsoft compilers which will handle .CPP as c++.
d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++.
ced61f5 Let CMake recognize .CPP .CXX and .C++ as c++ files.
2010-09-08 11:36:46 -04:00
Brad King 661d5166b0 Merge topic 'FindwxWidgets-fixes'
ede24f8 ENH #8993: FindwxWidgets add support for wx-config custom options.
3dbeeb7 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.
f46712e BUG #11123: Generic include dir should come after config specific one.
6cb14eb STYLE: Clarified/Fixed documentation of UsewxWidgets.
36c15a2 BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.
2010-09-08 11:08:55 -04:00
Brad King 18c71e3c79 Merge topic 'fix-10417'
e93a4b4 Avoid adding self as prerequisite. (#10417)
2010-09-08 11:08:22 -04:00
Brad King 795676062e Merge topic 'fix-9284'
88fed66 Make bundle items writable before fixup (#9284)
2010-09-08 11:08:16 -04:00
Brad King 048c905f05 Merge topic 'hpux-required-runtime-path-10571'
11a917d HP-UX: Always add /usr/lib to rpath (#10571)
2010-09-08 11:08:13 -04:00
Brad King dd0b68a214 Merge topic '11186'
c167595 Merge patch for detecting gdk-pixbuf library
2010-09-08 11:08:09 -04:00
Brad King 28edb70a9e Merge topic 'vs-project-groups'
e6ac0aa Add FOLDER target property, for IDEs (#3796)
2010-09-08 11:08:05 -04:00
Brad King 02e3f42a6a Merge topic 'watcom_fixes'
3b7da53 Fix for bug 10388, fix various default flags.
2010-09-08 11:08:01 -04:00
Brad King 2079424568 Merge topic 'find-macports'
eae45a6 Search MacPorts /opt/local prefix on Mac
2010-09-08 11:07:59 -04:00
Brad King 4ea441eaf9 Merge topic 'ImproveFindPackageConfigMode'
5cdfc9c Improve wording of the error message of find_package() in config-mode
4969c3b Improve version notice in the generated message
e8ae504 Add option CONFIG_MODE to FPHSA()
b4b8f96 Don't create an empty element at the end of Foo_CONSIDERED_CONFIGS/VERSIONS
cc955a0 Small cleanup of FindPackageHandleStandardArgs.cmake
0367245 Replace the two vector<string,string> with one vector<struct{string,string}>
130b0e2 Improve error message in Config-mode when no appropriate version was found
dfe9c95 Record all considered Config files and their versions.
2010-09-08 11:07:55 -04:00
Brad King 81fa6bbcc7 Merge topic 'ctest-show-labels'
32242af Added CTest command --print-labels
2010-09-08 11:07:51 -04:00
Brad King c9b0e1da5c Merge topic 'CPack-PreserveSymlinksInInstalledDirs-v2'
013e003 CPack  handle symlinks in CPACK_INSTALLED_DIRECTORIES fix for bug5430
2010-09-08 11:07:38 -04:00
KWSys Robot 711c610314 KWSys Nightly Date Stamp 2010-09-08 00:10:41 -04:00
Mike McQuaid 88fed668b1 Make bundle items writable before fixup (#9284)
This ensures that any bundle items are made user writable before
any attempt is made to alter them using install_name_tool. This is
because MacPorts/Fink/Homebrew don't install libraries as writable.
This fix is needed to allow fixup_bundle_item to work correctly
when ingesting libraries installed by these package managers.
2010-09-07 22:49:32 -04:00