[Cmake-commits] CMake branch, next, updated. v2.8.6-1533-g569cadc
Stephen Kelly
steveire at gmail.com
Sat Oct 8 06:50:08 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 569cadc9163fe731689a1193cd56d155e726a12f (commit)
via 2a27e01b30a9e0cc4cd90b168b50618e28e00a2a (commit)
from fd014dbef718d834f671b5c5762beac6eb7734d2 (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=569cadc9163fe731689a1193cd56d155e726a12f
commit 569cadc9163fe731689a1193cd56d155e726a12f
Merge: fd014db 2a27e01
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 8 06:49:55 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 8 06:49:55 2011 -0400
Merge topic 'cmake-link-interface-libraries' into next
2a27e01 Quote everything to avoid space in directory name errors.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a27e01b30a9e0cc4cd90b168b50618e28e00a2a
commit 2a27e01b30a9e0cc4cd90b168b50618e28e00a2a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 8 12:48:37 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 8 12:48:37 2011 +0200
Quote everything to avoid space in directory name errors.
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 217634a..79c447e 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -61,8 +61,8 @@ foreach(B1 ${Bools})
"export(TARGETS libA libB libC FILE Targets.cmake)\n"
)
- try_compile(Result ${CMAKE_CURRENT_BINARY_DIR}/libs_build_${B1}_${B2}
- ${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}
+ try_compile(Result "${CMAKE_CURRENT_BINARY_DIR}/libs_build_${B1}_${B2}"
+ "${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}"
libs
OUTPUT_VARIABLE Out
)
@@ -87,13 +87,13 @@ macro(_do_build CLEAR_LINK_INTERFACE_LIBRARIES
# Set local short variables to avoid long lines
set(B1 ${CLEAR_LINK_INTERFACE_LIBRARIES})
set(B2 ${SPECIFY_LINK_INTERFACE_LIBRARIES})
- set(Libs_Build_Dir ${CMAKE_CURRENT_BINARY_DIR}/libs_build_${B1}_${B2})
+ set(Libs_Build_Dir "${CMAKE_CURRENT_BINARY_DIR}/libs_build_${B1}_${B2}")
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/CMakeLists.txt"
- "include_directories(${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}\n"
- " ${Libs_Build_Dir}\n"
+ "include_directories(\"${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}\"\n"
+ " \"${Libs_Build_Dir}\"\n"
")\n"
- "include(${Libs_Build_Dir}/Targets.cmake)\n"
+ "include(\"${Libs_Build_Dir}/Targets.cmake\")\n"
)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp"
@@ -154,8 +154,8 @@ macro(_do_build CLEAR_LINK_INTERFACE_LIBRARIES
")\n"
)
- try_compile(Result ${CMAKE_CURRENT_BINARY_DIR}/fail${COUNT}
- ${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}
+ try_compile(Result "${CMAKE_CURRENT_BINARY_DIR}/fail${COUNT}"
+ "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}"
src
OUTPUT_VARIABLE Out
)
-----------------------------------------------------------------------
Summary of changes:
.../target_link_libraries/CMakeLists.txt | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list