[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-130-g26ab8b8

[Brad King]

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  26ab8b8e7deb6a583de55edc80d59eb91e74a8cd (commit)
       via  326ad9949fb8c74b2e266c152bcc9437ea2d484e (commit)
      from  2b1f8d5217d2b179d976dfca1bf5982f6be06c00 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26ab8b8e7deb6a583de55edc80d59eb91e74a8cd
commit 26ab8b8e7deb6a583de55edc80d59eb91e74a8cd
Merge: 2b1f8d5 326ad99
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 12 13:57:58 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 12 13:57:58 2016 -0500

    Merge topic 'fix-export-header-test' into next
    
    326ad994 Tests: fix GenerateExportHeader directory definitions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=326ad9949fb8c74b2e266c152bcc9437ea2d484e
commit 326ad9949fb8c74b2e266c152bcc9437ea2d484e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Feb 12 13:14:59 2016 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Feb 12 13:50:32 2016 -0500

    Tests: fix GenerateExportHeader directory definitions
    
    There's no need to stringify the values, but instead just pass in
    strings. The core problem is that the path may have tokens which are
    replaced by the preprocessor which causes an invalid path to be used.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 8cd25a4..7fce330 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -124,6 +124,6 @@ endif()
 message("#### Testing reference: ${_platform}")
 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 4f45f37..7802c43 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -136,13 +136,10 @@ int main()
   libstatic_not_exported();
   libstatic_excluded();
 
-#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");
+  compare(SRC_DIR "/libshared_export.h",
+          BIN_DIR "/libshared/libshared_export.h");
+  compare(SRC_DIR "/libstatic_export.h",
+          BIN_DIR "/libstatic/libstatic_export.h");
 
   return 0;
 }

-----------------------------------------------------------------------

Summary of changes:
 Tests/Module/GenerateExportHeader/CMakeLists.txt        |    4 ++--
 Tests/Module/GenerateExportHeader/exportheader_test.cpp |   11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake