[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.23 1.23.2.1 COPYING NONE 1.1.2.2 curl.copyright 1.2 NONE

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Added Files:
      Tag: CMake-2-8
	COPYING 
Removed Files:
      Tag: CMake-2-8
	curl.copyright 
Log Message:
Merge in changes to CMake-2-8 RC 2


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C 2 -d -r1.23 -r1.23.2.1
*** CMakeLists.txt	10 Apr 2009 15:59:31 -0000	1.23
--- CMakeLists.txt	1 Oct 2009 21:21:27 -0000	1.23.2.1
***************
*** 747,748 ****
--- 747,749 ----
  TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
  ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL")
+ INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)

--- curl.copyright DELETED ---

--- NEW FILE: COPYING ---
COPYRIGHT AND PERMISSION NOTICE

Copyright (c) 1996 - 2009, Daniel Stenberg, <daniel at haxx.se>.

All rights reserved.

Permission to use, copy, modify, and distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright
notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of a copyright holder shall not
be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization of the copyright holder.