certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi CMakeLists.txt


From: certi-cvs
Subject: [certi-cvs] certi CMakeLists.txt
Date: Wed, 07 May 2008 14:10:29 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Mathé <jmm>    08/05/07 14:10:29

Modified files:
        .              : CMakeLists.txt 

Log message:
        More fix for
        bug #23196 : Make CERTI compilable with cmake 2.6.0
        on Win32 platform

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

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- CMakeLists.txt      7 May 2008 10:51:07 -0000       1.45
+++ CMakeLists.txt      7 May 2008 14:10:29 -0000       1.46
@@ -2,6 +2,9 @@
 PROJECT(CERTI CXX)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4)
+IF(COMMAND CMAKE_POLICY)
+  CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(COMMAND CMAKE_POLICY)
 ENABLE_LANGUAGE(C)
 
 # Use CERTI specific CMake modules first
@@ -157,13 +160,17 @@
 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}")
-    FIND_LIBRARY(SOCKET_LIBRARY socket)
+    FIND_LIBRARY(SOCKET_LIBRARY 
+                                 NAMES socket)
 ELSE (SOCKET_LIBRARY_HAS_CONNECT)
     SET(SOCKET_LIBRARY)
 ENDIF (SOCKET_LIBRARY_HAS_CONNECT)
 
 IF (WIN32)
-    FIND_LIBRARY(SOCKET_LIBRARY Ws2_32)
+    #FIND_LIBRARY(SOCKET_LIBRARY 
+       #                          NAMES Ws2_32
+       #                       DOC "The Winsock2 library")
+       SET(SOCKET_LIBRARY Ws2_32)
 ENDIF (WIN32)
 
 ################ LIBXML2 install Check ####################




reply via email to

[Prev in Thread] Current Thread [Next in Thread]