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

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/12/18 15:25:43

Modified files:
        libCERTI       : Socket.hh 
        .              : CMakeLists.txt 

Log message:
        Enable cross-compiling with libxml2 support as well

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Socket.hh?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.110&r2=1.111

Patches:
Index: libCERTI/Socket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Socket.hh,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/Socket.hh  20 Mar 2010 17:30:37 -0000      3.19
+++ libCERTI/Socket.hh  18 Dec 2011 15:25:43 -0000      3.20
@@ -27,7 +27,7 @@
 # define NOMINMAX
 # endif
 # include <winsock2.h>
-# include <Ws2tcpip.h>
+# include <ws2tcpip.h>
 typedef u_long         in_addr_t;
 typedef unsigned short in_port_t;
 #else

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- CMakeLists.txt      18 Dec 2011 13:28:09 -0000      1.110
+++ CMakeLists.txt      18 Dec 2011 15:25:43 -0000      1.111
@@ -290,9 +290,7 @@
 ENDIF (WIN32)
 
 ################ LIBXML2 install Check ####################
-if (NOT CMAKE_CROSSCOMPILING)
-   FIND_PACKAGE(LibXml2)
-endif()
+FIND_PACKAGE(LibXml2)
 IF (LIBXML2_FOUND)
     ADD_DEFINITIONS(-DHAVE_XML ${LIBXML2_DEFINITIONS})
     INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})