[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.27 1.28

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv15283/Utilities/cmcurl

Modified Files:
	CMakeLists.txt 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** CMakeLists.txt	15 Dec 2009 19:20:28 -0000	1.27
--- CMakeLists.txt	15 Dec 2009 19:32:39 -0000	1.28
***************
*** 733,737 ****
  IF(CMAKE_BUILD_CURL_SHARED)
    SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
!     RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
    INSTALL_TARGETS(/bin cmcurl)
  ENDIF(CMAKE_BUILD_CURL_SHARED)
--- 733,737 ----
  IF(CMAKE_BUILD_CURL_SHARED)
    SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
!     RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR})
    INSTALL_TARGETS(/bin cmcurl)
  ENDIF(CMAKE_BUILD_CURL_SHARED)
***************
*** 744,747 ****
  ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
  TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
! ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL")
  INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)
--- 744,747 ----
  ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
  TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
! ADD_TEST(curl LIBCURL)
  INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)