[certi-cvs] certi libCERTI/CMakeLists.txt CMakeLists.txt

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/05/07 10:51:08

Modified files:
        libCERTI       : CMakeLists.txt 
        .              : CMakeLists.txt 

Log message:
        Fix CMake-2.6 warnings.
        Merged patch from Christian Ehrlicher
        see bug #23196 : Make CERTI compilable with cmake 2.6.0

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/CMakeLists.txt?cvsroot=certi&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.44&r2=1.45

Patches:
Index: libCERTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libCERTI/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libCERTI/CMakeLists.txt     26 Apr 2008 14:59:41 -0000      1.12
+++ libCERTI/CMakeLists.txt     7 May 2008 10:51:07 -0000       1.13
@@ -193,7 +193,7 @@
 ENDIF (MINGW)
 
 IF (HAVE_POSIX_CLOCK)
-    TARGET_LINK_LIBRARIES(CERTI rt)
+    TARGET_LINK_LIBRARIES(CERTI ${RT_LIBRARY})
 ENDIF (HAVE_POSIX_CLOCK)
 
 SET_TARGET_PROPERTIES(CERTI PROPERTIES VERSION 1.0.0 SOVERSION 1)

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- CMakeLists.txt      28 Apr 2008 17:46:33 -0000      1.44
+++ CMakeLists.txt      7 May 2008 10:51:07 -0000       1.45
@@ -131,7 +131,8 @@
 SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
 SET(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
 SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
-SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} rt") 
+FIND_LIBRARY(RT_LIBRARY rt)
+SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIBRARY}) 
 
 CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
 CHECK_FUNCTION_EXISTS(clock_settime HAVE_CLOCK_SETTIME)
@@ -156,13 +157,13 @@
 CHECK_LIBRARY_EXISTS("socket" "connect" "/usr/lib" SOCKET_LIBRARY_HAS_CONNECT)
 IF (SOCKET_LIBRARY_HAS_CONNECT)
     MESSAGE(STATUS "Socket library needed for system ${CMAKE_SYSTEM_NAME}")
-    SET(SOCKET_LIBRARY "socket")
+    FIND_LIBRARY(SOCKET_LIBRARY socket)
 ELSE (SOCKET_LIBRARY_HAS_CONNECT)
     SET(SOCKET_LIBRARY)
 ENDIF (SOCKET_LIBRARY_HAS_CONNECT)
 
 IF (WIN32)
-    SET(SOCKET_LIBRARY "Ws2_32")
+    FIND_LIBRARY(SOCKET_LIBRARY Ws2_32)
 ENDIF (WIN32)
 
 ################ LIBXML2 install Check ####################