diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2014-12-27 04:19:14 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2015-01-09 03:56:51 (GMT) |
| commit | 9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a (patch) | |
| tree | d6cfe01924dd4c3ca3f57acd5d3fa59b60cde4fa /Tests/Complex/Executable/CMakeLists.txt | |
| parent | 7ecbade8877522d9d565bcb2216f71426873f564 (diff) | |
| download | CMake-9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a.zip CMake-9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a.tar.gz CMake-9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a.tar.bz2 | |
Encoding: Modify tests to work using non-ascii paths.
For complex*, CustomCommand and OutDir tests, non-ascii paths
are avoided in test code by using relative paths, and setting
the working when running the test. This also avoids the
need to internationalize the test code.
For RunCMake.GeneratorExpression, use a UTF-8 encoding in
file(STRINGS) to retrieve the compiled absolute path correctly.
Diffstat (limited to 'Tests/Complex/Executable/CMakeLists.txt')
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index bf23d4a..508221c 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -89,18 +89,22 @@ remove_definitions(-DCOMPLEX_DEFINED) # Test pre-build/pre-link/post-build rules for an executable. add_custom_command(TARGET complex PRE_BUILD COMMAND ${CREATE_FILE_EXE} - ARGS "${Complex_BINARY_DIR}/Executable/prebuild.txt") + ARGS "Executable/prebuild.txt" + WORKING_DIRECTORY "${Complex_BINARY_DIR}") add_custom_command(TARGET complex PRE_LINK COMMAND ${CREATE_FILE_EXE} - ARGS "${Complex_BINARY_DIR}/Executable/prelink.txt") + ARGS "Executable/prelink.txt" + WORKING_DIRECTORY "${Complex_BINARY_DIR}") add_custom_command(TARGET complex POST_BUILD COMMAND ${CREATE_FILE_EXE} - ARGS "${Complex_BINARY_DIR}/Executable/postbuild.txt") + ARGS "Executable/postbuild.txt" + WORKING_DIRECTORY "${Complex_BINARY_DIR}") add_custom_command(TARGET complex POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy - "${Complex_BINARY_DIR}/Executable/postbuild.txt" - "${Complex_BINARY_DIR}/Executable/postbuild2.txt") + "Executable/postbuild.txt" + "Executable/postbuild2.txt" + WORKING_DIRECTORY "${Complex_BINARY_DIR}") set_source_files_properties(complex COMPILE_FLAGS |