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 commits
Subject: [certi-cvs] certi CMakeLists.txt
Date: Tue, 24 Sep 2013 09:16:41 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      13/09/24 09:16:41

Modified files:
        .              : CMakeLists.txt 

Log message:
        Merge patch #8184 with slight modification to avoid 
--enable-auto-import when
        cross-compiling because mingw32/64 cross compiler doesn not seem to 
support
        the option.

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

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- CMakeLists.txt      17 Sep 2013 15:05:55 -0000      1.121
+++ CMakeLists.txt      24 Sep 2013 09:16:41 -0000      1.122
@@ -420,8 +420,20 @@
         CACHE STRING "Flags used by the linker during the creation of 
modules." FORCE)
 
    #set(PROPERTY LINK_FLAGS_DEBUG "-flat_namespace -undefined suppress")
-Endif(APPLE)
+endif(APPLE)
 
+# FIX for mingw for auto-import without -enable-auto-import warning
+if (NOT CMAKE_CROSSCOMPILING)
+   message("CMAKE_CROSSCOMPILING = ${CMAKE_CROSSCOMPILING}")
+   if (MINGW)
+       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} 
--enable-auto-import")
+       SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} 
--enable-auto-import"
+            CACHE STRING "Flags used by the linker during the creation of 
dll's." FORCE)
+       # module linker flags
+       SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} 
--enable-auto-import"
+            CACHE STRING "Flags used by the linker during the creation of 
modules." FORCE)
+   endif(MINGW)
+endif(NOT CMAKE_CROSSCOMPILING)
 
 ADD_SUBDIRECTORY( include )
 ADD_SUBDIRECTORY( libHLA )



reply via email to

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