diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-16 14:52:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-16 14:52:28 (GMT) |
| commit | c92547e88c64777094f47fbde222f8bd8d3ab41d (patch) | |
| tree | a0071dc8eef682a6e89388a0e76a644b0d319e14 | |
| parent | c0a0c7d3f226943818c0152bbcb9a0d026c3274e (diff) | |
| parent | 326ad9949fb8c74b2e266c152bcc9437ea2d484e (diff) | |
| download | CMake-c92547e88c64777094f47fbde222f8bd8d3ab41d.zip CMake-c92547e88c64777094f47fbde222f8bd8d3ab41d.tar.gz CMake-c92547e88c64777094f47fbde222f8bd8d3ab41d.tar.bz2 | |
Merge topic 'fix-export-header-test'
326ad994 Tests: fix GenerateExportHeader directory definitions
| -rw-r--r-- | Tests/Module/GenerateExportHeader/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/Module/GenerateExportHeader/exportheader_test.cpp | 11 |
2 files changed, 6 insertions, 9 deletions
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; } |