[Cmake-commits] CMake branch, next, updated. v2.8.4-1568-g2d71e81
Brad King
brad.king at kitware.com
Thu May 19 08:32:26 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2d71e819c60a77787f9cdea5e281289404d9f8a7 (commit)
via 7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d (commit)
via 4268e3d7e92eee0871dac1b92f64e18c374c7b43 (commit)
from d7b5353dbdc5e1e4015ea67f86e6a5dcf5ff0573 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d71e819c60a77787f9cdea5e281289404d9f8a7
commit 2d71e819c60a77787f9cdea5e281289404d9f8a7
Merge: d7b5353 7039d1f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 19 08:32:21 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 19 08:32:21 2011 -0400
Merge topic 'output-compile-lines' into next
7039d1f Fix CompileCommandOutput test for Make tools not supporting spaces
4268e3d run_compile_commands: Cast istream::get() result to char
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d
commit 7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 19 08:11:34 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu May 19 07:38:06 2011 -0400
Fix CompileCommandOutput test for Make tools not supporting spaces
Use underscores instead of spaces for such Make tools.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2344af7..e9aed16 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -11,6 +11,7 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
--build-generator ${CMAKE_TEST_GENERATOR}
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-project ${proj}
+ ${${NAME}_EXTRA_OPTIONS}
--test-command ${COMMAND} ${ARGN})
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
ENDMACRO(ADD_TEST_MACRO)
@@ -2037,6 +2038,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
ENDFOREACH()
IF(TEST_CompileCommandOutput)
+ SET(CompileCommandOutput_EXTRA_OPTIONS
+ --build-options -DMAKE_SUPPORTS_SPACES=${MAKE_IS_GNU})
ADD_TEST_MACRO(CompileCommandOutput
"${CMake_BINARY_DIR}/Tests/CMakeLib/runcompilecommands")
ENDIF()
diff --git a/Tests/CompileCommandOutput/CMakeLists.txt b/Tests/CompileCommandOutput/CMakeLists.txt
index ac39b8b..bd8e305 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 9487c89..145a064 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 5759319..554e176 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 49b686c..0000000
--- 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 0000000..4f42ccf
--- /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 0000000..0d73e31
--- /dev/null
+++ b/Tests/CompileCommandOutput/file_with_underscores.h
@@ -0,0 +1 @@
+void file_with_underscores();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4268e3d7e92eee0871dac1b92f64e18c374c7b43
commit 4268e3d7e92eee0871dac1b92f64e18c374c7b43
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 19 08:02:21 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu May 19 08:02:21 2011 -0400
run_compile_commands: Cast istream::get() result to char
We perform error checking on the stream after reading so this conversion
is safe.
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx
index a0be2eb..3f141c5 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -96,7 +96,7 @@ private:
void Next()
{
- this->C = Input->get();
+ this->C = char(Input->get());
if (this->Input->bad()) ErrorExit("Unexpected end of file.");
}
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLib/run_compile_commands.cxx | 2 +-
Tests/CMakeLists.txt | 3 +++
Tests/CompileCommandOutput/CMakeLists.txt | 7 ++++++-
.../compile_command_output.cxx | 4 ++--
Tests/CompileCommandOutput/file with spaces.cxx | 4 +---
Tests/CompileCommandOutput/file with spaces.h | 1 -
.../CompileCommandOutput/file_with_underscores.cxx | 3 +++
Tests/CompileCommandOutput/file_with_underscores.h | 1 +
8 files changed, 17 insertions(+), 8 deletions(-)
delete mode 100644 Tests/CompileCommandOutput/file with spaces.h
create mode 100644 Tests/CompileCommandOutput/file_with_underscores.cxx
create mode 100644 Tests/CompileCommandOutput/file_with_underscores.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list