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 1cf1d65a919d3e2d66393c04ffb1e8dd3d54e1fb (commit)
via aa1e89caf70c59548b023426c6b003f818cbb750 (commit)
from 79cd32e502535af8d7f70de4f6480ad940969cfe (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=1cf1d65a919d3e2d66393c04ffb1e8dd3d54e1fb
commit 1cf1d65a919d3e2d66393c04ffb1e8dd3d54e1fb
Merge: 79cd32e aa1e89c
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Dec 11 07:00:39 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 11 07:00:39 2013 -0500
Merge topic 'GenerateExportHeader-tests' into next
aa1e89c Try to fix on MSVC6.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa1e89caf70c59548b023426c6b003f818cbb750
commit aa1e89caf70c59548b023426c6b003f818cbb750
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Dec 11 13:00:04 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Dec 11 13:00:04 2013 +0100
Try to fix on MSVC6.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 3c0254e..9ce44fa 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -197,6 +197,6 @@ else()
endif()
target_compile_definitions(GenerateExportHeader
PRIVATE
- SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}/reference/${_platform}"
- BIN_DIR="${CMAKE_CURRENT_BINARY_DIR}"
+ "SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}/reference/${_platform}"
+ "BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}"
)
diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
index d82d02e..e5f30fa 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -124,10 +124,13 @@ int main()
libstatic_not_exported();
libstatic_excluded();
- compare(SRC_DIR "/libshared_export.h",
- BIN_DIR "/libshared/libshared_export.h");
- compare(SRC_DIR "/libstatic_export.h",
- BIN_DIR "/libstatic/libstatic_export.h");
+#define STRINGIFY_IMPL(A) #A
+#define STRINGIFY(A) STRINGIFY_IMPL(A)
+
+ compare(STRINGIFY(SRC_DIR) "/libshared_export.h",
+ STRINGIFY(BIN_DIR) "/libshared/libshared_export.h");
+ compare(STRINGIFY(SRC_DIR) "/libstatic_export.h",
+ STRINGIFY(BIN_DIR) "/libstatic/libstatic_export.h");
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/GenerateExportHeader/CMakeLists.txt | 4 ++--
.../GenerateExportHeader/exportheader_test.cpp | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
