diff options
| author | Brad King <brad.king@kitware.com> | 2011-04-05 18:28:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-04-05 18:28:55 (GMT) |
| commit | e560bf4ba3cf860afe5bc8e23cd6d02dd1c366c1 (patch) | |
| tree | 36596b088eaa74f17ac151e95e91a98da8646a7f /Tests | |
| parent | ca10dc47865bd764409c5600ba46d9ceb7367350 (diff) | |
| parent | 9a6ff95072f9e03713e1a5d16338d97f9b371f4b (diff) | |
| download | CMake-e560bf4ba3cf860afe5bc8e23cd6d02dd1c366c1.zip CMake-e560bf4ba3cf860afe5bc8e23cd6d02dd1c366c1.tar.gz CMake-e560bf4ba3cf860afe5bc8e23cd6d02dd1c366c1.tar.bz2 | |
Merge topic 'fix_vs10_object_files'
9a6ff95 Fix for bug where VS2010 did not use .obj files as part of the build.
Diffstat (limited to 'Tests')
| -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}) |