[certi-cvs] certi CMakeLists.txt

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      13/09/25 09:46:43

Modified files:
        .              : CMakeLists.txt 

Log message:
        On native windows build keep one-dash prefix option
        -enable-auto-import

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

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- CMakeLists.txt      24 Sep 2013 09:16:41 -0000      1.122
+++ CMakeLists.txt      25 Sep 2013 09:46:43 -0000      1.123
@@ -423,17 +423,23 @@
 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"
+if (MINGW)
+   if (CMAKE_CROSSCOMPILING)
+       # mingw Cross-compiler does not seem to handle the flags??
+       # even if the builtin doc mention it
+       #set(AUTOIMPORT_FLAGS "--enable-auto-import")
+       set(AUTOIMPORT_FLAGS "")
+   else (CMAKE_CROSSCOMPILING)
+       set(AUTOIMPORT_FLAGS "-enable-auto-import")
+   endif(CMAKE_CROSSCOMPILING)
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${AUTOIMPORT_FLAGS}")
+   
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} 
${AUTOIMPORT_FLAGS}"
             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"
+   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} 
${AUTOIMPORT_FLAGS}"
             CACHE STRING "Flags used by the linker during the creation of 
modules." FORCE)
-   endif(MINGW)
-endif(NOT CMAKE_CROSSCOMPILING)
+endif(MINGW)
 
 ADD_SUBDIRECTORY( include )
 ADD_SUBDIRECTORY( libHLA )