Commit 7039d1fd authored by Brad King's avatar Brad King

Fix CompileCommandOutput test for Make tools not supporting spaces

Use underscores instead of spaces for such Make tools.
parent 4268e3d7
...@@ -11,6 +11,7 @@ MACRO(ADD_TEST_MACRO NAME COMMAND) ...@@ -11,6 +11,7 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
--build-generator ${CMAKE_TEST_GENERATOR} --build-generator ${CMAKE_TEST_GENERATOR}
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-project ${proj} --build-project ${proj}
${${NAME}_EXTRA_OPTIONS}
--test-command ${COMMAND} ${ARGN}) --test-command ${COMMAND} ${ARGN})
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
ENDMACRO(ADD_TEST_MACRO) ENDMACRO(ADD_TEST_MACRO)
...@@ -2037,6 +2038,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ...@@ -2037,6 +2038,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
ENDFOREACH() ENDFOREACH()
IF(TEST_CompileCommandOutput) IF(TEST_CompileCommandOutput)
SET(CompileCommandOutput_EXTRA_OPTIONS
--build-options -DMAKE_SUPPORTS_SPACES=${MAKE_IS_GNU})
ADD_TEST_MACRO(CompileCommandOutput ADD_TEST_MACRO(CompileCommandOutput
"${CMake_BINARY_DIR}/Tests/CMakeLib/runcompilecommands") "${CMake_BINARY_DIR}/Tests/CMakeLib/runcompilecommands")
ENDIF() ENDIF()
......
...@@ -4,7 +4,12 @@ project (CompileCommandOutput CXX) ...@@ -4,7 +4,12 @@ project (CompileCommandOutput CXX)
SET(CMAKE_EXPORT_COMPILE_COMMANDS ON) SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") 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") ADD_LIBRARY(test2 SHARED "../CompileCommandOutput/relative.cxx")
INCLUDE_DIRECTORIES(${CompileCommandOutput_SOURCE_DIR}/../../Source) INCLUDE_DIRECTORIES(${CompileCommandOutput_SOURCE_DIR}/../../Source)
ADD_EXECUTABLE(CompileCommandOutput compile_command_output.cxx) ADD_EXECUTABLE(CompileCommandOutput compile_command_output.cxx)
......
#include "file with spaces.h" #include "file_with_underscores.h"
#include "relative.h" #include "relative.h"
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
file_with_spaces(); file_with_underscores();
relative(); relative();
return 0; return 0;
} }
#include "file with spaces.h" #include "file_with_underscores.cxx"
void file_with_spaces() {}
#include "file_with_underscores.h"
void file_with_underscores() {}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment