[certi-cvs] certi CMakeLists.txt

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      13/12/06 10:34:08

Modified files:
        .              : CMakeLists.txt 

Log message:
        Add ENABLE_MINGW_AUTOIMPORT option and avoid discovering which version 
of MinGW
        support the -enable-auto-import option.
        This close patch #8184.

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

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- CMakeLists.txt      2 Oct 2013 13:49:30 -0000       1.128
+++ CMakeLists.txt      6 Dec 2013 10:34:08 -0000       1.129
@@ -128,7 +128,11 @@
    SET(CMAKE_BUILD_TYPE "Debug")
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "debug library postfix, usually d on 
windows")
+SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "debug library postfix, usually 'd' 
on windows")
+# This has to be set manually because varying version of MinGW support or not 
support
+# this particular command line option, the default is not to use it.
+# If you want it swicth this option to ON. 
+option(ENABLE_MINGW_AUTOIMPORT "will add -enable-auto-import to MinGW compiler 
option" OFF)
 
 # Force CMAKE_COMPILER_IS_GNUCC even if gcc used with ccache
 IF("${CMAKE_C_COMPILER}" MATCHES "ccache")
@@ -429,21 +433,15 @@
 
 # FIX for mingw for auto-import without -enable-auto-import warning
 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)
+   if (ENABLE_MINGW_AUTOIMPORT)
        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} 
${AUTOIMPORT_FLAGS}"
             CACHE STRING "Flags used by the linker during the creation of 
modules." FORCE)
+   endif()
 endif(MINGW)
 
 ADD_SUBDIRECTORY( include )
@@ -458,7 +456,7 @@
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CERTI An efficient Open Source HLA 
RunTime Infrastructure")
 SET(CPACK_PACKAGE_VENDOR "ONERA/DTIM")
-SET(CPACK_PACKAGE_CONTACT "address@hidden")
+SET(CPACK_PACKAGE_CONTACT "CERTI Development Team <address@hidden>")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE 
"${CMAKE_CURRENT_SOURCE_DIR}/CERTI_DESCRIPTION.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt")
 SET(CPACK_PACKAGE_NAME "${PACKAGE_NAME}")