diff options
| author | Brad King <brad.king@kitware.com> | 2011-05-19 08:11:34 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-05-19 07:38:06 -0400 |
| commit | 7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d (patch) | |
| tree | 99fd1835f9717980e5a4953ea0c9a52160e52e65 /Tests/CompileCommandOutput | |
| parent | 4268e3d7e92eee0871dac1b92f64e18c374c7b43 (diff) | |
| download | cmake-7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d.tar.gz | |
Fix CompileCommandOutput test for Make tools not supporting spaces
Use underscores instead of spaces for such Make tools.
Diffstat (limited to 'Tests/CompileCommandOutput')
6 files changed, 13 insertions, 7 deletions
diff --git a/Tests/CompileCommandOutput/CMakeLists.txt b/Tests/CompileCommandOutput/CMakeLists.txt index ac39b8bb34..bd8e305c2d 100644 --- a/Tests/CompileCommandOutput/CMakeLists.txt +++ b/Tests/CompileCommandOutput/CMakeLists.txt @@ -4,7 +4,12 @@ project (CompileCommandOutput CXX) SET(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") -ADD_LIBRARY(test1 STATIC "file with spaces.cxx") +IF(MAKE_SUPPORTS_SPACES) + SET(test1_srcs "file with spaces.cxx") +ELSE() + SET(test1_srcs "file_with_underscores.cxx") +ENDIF() +ADD_LIBRARY(test1 STATIC ${test1_srcs}) ADD_LIBRARY(test2 SHARED "../CompileCommandOutput/relative.cxx") INCLUDE_DIRECTORIES(${CompileCommandOutput_SOURCE_DIR}/../../Source) ADD_EXECUTABLE(CompileCommandOutput compile_command_output.cxx) diff --git a/Tests/CompileCommandOutput/compile_command_output.cxx b/Tests/CompileCommandOutput/compile_command_output.cxx index 9487c896cd..145a064267 100644 --- a/Tests/CompileCommandOutput/compile_command_output.cxx +++ b/Tests/CompileCommandOutput/compile_command_output.cxx @@ -1,9 +1,9 @@ -#include "file with spaces.h" +#include "file_with_underscores.h" #include "relative.h" int main (int argc, char** argv) { - file_with_spaces(); + file_with_underscores(); relative(); return 0; } diff --git a/Tests/CompileCommandOutput/file with spaces.cxx b/Tests/CompileCommandOutput/file with spaces.cxx index 5759319df1..554e176e48 100644 --- a/Tests/CompileCommandOutput/file with spaces.cxx +++ b/Tests/CompileCommandOutput/file with spaces.cxx @@ -1,3 +1 @@ -#include "file with spaces.h" - -void file_with_spaces() {} +#include "file_with_underscores.cxx" diff --git a/Tests/CompileCommandOutput/file with spaces.h b/Tests/CompileCommandOutput/file with spaces.h deleted file mode 100644 index 49b686c007..0000000000 --- a/Tests/CompileCommandOutput/file with spaces.h +++ /dev/null @@ -1 +0,0 @@ -void file_with_spaces(); diff --git a/Tests/CompileCommandOutput/file_with_underscores.cxx b/Tests/CompileCommandOutput/file_with_underscores.cxx new file mode 100644 index 0000000000..4f42ccf569 --- /dev/null +++ b/Tests/CompileCommandOutput/file_with_underscores.cxx @@ -0,0 +1,3 @@ +#include "file_with_underscores.h" + +void file_with_underscores() {} diff --git a/Tests/CompileCommandOutput/file_with_underscores.h b/Tests/CompileCommandOutput/file_with_underscores.h new file mode 100644 index 0000000000..0d73e31599 --- /dev/null +++ b/Tests/CompileCommandOutput/file_with_underscores.h @@ -0,0 +1 @@ +void file_with_underscores(); |