From 633c2965526743e8ae4ce4202a7b17cf6562edd3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 15 Dec 2009 14:32:39 -0500 Subject: cmcurl: Fix test and dll output directories The commit "Clean up CMake build tree 'bin' directory" changed the setting of EXECUTABLE_OUTPUT_PATH that affects the cmcurl directory to empty. We now fix the 'curl' test to refer to the LIBCURL executable locally. When CMAKE_BUILD_CURL_SHARED is enabled we now put cmcurl.dll next to the cmake executable. These changes remove use of EXECUTABLE_OUTPUT_PATH from cmcurl. --- Utilities/cmcurl/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 63cdc27..c136f19 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -732,7 +732,7 @@ ADD_LIBRARY(cmcurl ${LIBRARY_TYPE} ${libCurl_SRCS}) TARGET_LINK_LIBRARIES(cmcurl ${CURL_LIBS}) IF(CMAKE_BUILD_CURL_SHARED) SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL - RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) + RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR}) INSTALL_TARGETS(/bin cmcurl) ENDIF(CMAKE_BUILD_CURL_SHARED) @@ -743,5 +743,5 @@ ENDIF(CURL_TESTING) ADD_EXECUTABLE(LIBCURL Testing/curltest.c) TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS}) -ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL") +ADD_TEST(curl LIBCURL) INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl) -- cgit v0.12