certi CMakeLists.txt include/certi.hh libRTI/CM...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/01/24 16:15:57

Modified files:
        .              : CMakeLists.txt 
        include        : certi.hh 
        libRTI         : CMakeLists.txt 

Log message:
        Bug #22090 correction (about DevC++ compilation correction)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.7&r2=1.8

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- CMakeLists.txt      9 Dec 2007 16:25:19 -0000       1.30
+++ CMakeLists.txt      24 Jan 2008 16:15:56 -0000      1.31
@@ -51,12 +51,14 @@
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 # Enforce strict ANSI C/C++ compliance checking
+IF(NOT MINGW)
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -ansi -W -Wno-unused-function")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -ansi -W 
-Woverloaded-virtual -Wno-unused-function")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(NOT MINGW)
 
 IF (WIN32)
     IF (MINGW)

Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- include/certi.hh    17 Dec 2007 16:01:24 -0000      3.23
+++ include/certi.hh    24 Jan 2008 16:15:56 -0000      3.24
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: certi.hh,v 3.23 2007/12/17 16:01:24 rousse Exp $
+// $Id: certi.hh,v 3.24 2008/01/24 16:15:56 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_HH_INCLUDED
@@ -40,12 +40,14 @@
        #endif  
     typedef u_long                             in_addr_t;
     typedef unsigned short             in_port_t;
+    #ifdef _MSC_VER
     typedef unsigned __int32   uint32_t;
     typedef __int32                            int32_t;
     typedef unsigned __int16   uint16_t;
     typedef __int16                            int16_t;
     typedef unsigned __int8    uint8_t;
     typedef __int8                             int8_t;
+    #endif
 #else
        #define STAT_FUNCTION           stat
        #define STAT_STRUCT                     struct stat
@@ -324,4 +326,4 @@
 
 #endif // CERTI_HH_INCLUDED
 
-// $Id: certi.hh,v 3.23 2007/12/17 16:01:24 rousse Exp $
+// $Id: certi.hh,v 3.24 2008/01/24 16:15:56 rousse Exp $

Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libRTI/CMakeLists.txt       19 Nov 2007 10:04:33 -0000      1.7
+++ libRTI/CMakeLists.txt       24 Jan 2008 16:15:57 -0000      1.8
@@ -23,7 +23,7 @@
 SET_TARGET_PROPERTIES(RTI PROPERTIES VERSION 1.0.0 SOVERSION 1)
 IF (MINGW)
     SET_TARGET_PROPERTIES(RTI PROPERTIES LINK_FLAGS 
"-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libRTI.def")
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/RTI.def
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libRTI.def
             DESTINATION lib)
 ENDIF (MINGW)