diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2011-04-01 20:28:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2011-04-01 20:28:41 (GMT) |
| commit | 9a6ff95072f9e03713e1a5d16338d97f9b371f4b (patch) | |
| tree | f01b7446fa8610ef49780d873be649c8ca1ff8c3 /Tests/ExternalOBJ | |
| parent | 0315d3b66f31a6db21242a020f0a666547e470cc (diff) | |
| download | CMake-9a6ff95072f9e03713e1a5d16338d97f9b371f4b.zip CMake-9a6ff95072f9e03713e1a5d16338d97f9b371f4b.tar.gz CMake-9a6ff95072f9e03713e1a5d16338d97f9b371f4b.tar.bz2 | |
Fix for bug where VS2010 did not use .obj files as part of the build.
For VS2010 if a precompiled .obj file was the output of a custom commad,
it was used as part of the build. If it was not, then VS did not
use it as part of the build. This commit updates the test to check
for this issue, and fixes the problem. This fixes bugs #0011891 and
Diffstat (limited to 'Tests/ExternalOBJ')
| -rw-r--r-- | Tests/ExternalOBJ/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tests/ExternalOBJ/CMakeLists.txt b/Tests/ExternalOBJ/CMakeLists.txt index 3fef135..f12de11 100644 --- a/Tests/ExternalOBJ/CMakeLists.txt +++ b/Tests/ExternalOBJ/CMakeLists.txt @@ -51,5 +51,11 @@ ADD_CUSTOM_COMMAND( DEPENDS ${EXTERNAL_OBJECT} ) +message("${EXTERNAL_OBJECT}") # Build an executable using the external object file. ADD_EXECUTABLE(ExternalOBJ executable.cxx ${CUSTOM_OBJECT}) +# A bug showed up in VS2010 where an object file that was +# part of a custom commad output worked, but ones that were +# not didn't work. So, repeat the executable using the object +# directly and not from the output of the copy. +ADD_EXECUTABLE(ExternalOBJ2 executable.cxx ${EXTERNAL_OBJECT}) |