From: jean-pierre roux Date: Fri, 8 Apr 2011 16:27:08 +0000 (+0000) Subject: Build librairies as static, to avoid troubles with unaware users. X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=444c244419a8a1b3f35b25a984ecdb76d06f2bc5;p=crea.git Build librairies as static, to avoid troubles with unaware users. --- diff --git a/cmake/CREAMacro_DynamicLibraryExport.cmake b/cmake/CREAMacro_DynamicLibraryExport.cmake index 67f9277..00598ef 100644 --- a/cmake/CREAMacro_DynamicLibraryExport.cmake +++ b/cmake/CREAMacro_DynamicLibraryExport.cmake @@ -7,7 +7,8 @@ MACRO(CREA_DYNAMIC_LIBRARY_EXPORT_OPTION LIBRARY_NAME) # STATIC OR DYNAMIC (SHARED) ? OPTION( ${LIBRARY_NAME}_BUILD_SHARED - "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON) + #JPR 8 Avr 2011 ON-> OFF, to avoid troubles with unaware users + "Build ${LIBRARY_NAME} as a shared library ( i.e. dynamic) ?" OFF) IF (${LIBRARY_NAME}_BUILD_SHARED) SET(${LIBRARY_NAME}_SHARED SHARED) CREA_DEFINE(${LIBRARY_NAME}_BUILD_SHARED) diff --git a/cmake/CREAMacro_ManageSharedLibrary.cmake b/cmake/CREAMacro_ManageSharedLibrary.cmake index bbfabd6..0789f00 100644 --- a/cmake/CREAMacro_ManageSharedLibrary.cmake +++ b/cmake/CREAMacro_ManageSharedLibrary.cmake @@ -6,8 +6,9 @@ MACRO(CREA_MANAGE_SHARED_LIBRARY LIBRARY_NAME) # STATIC OR DYNAMIC (SHARED) ? - OPTION( ${LIBRARY_NAME}_BUILD_SHARED - "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON) + OPTION( ${LIBRARY_NAME}_BUILD_SHARED + #JPR 8 Avr 2011 ON-> OFF, to avoid troubles with unaware users + "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" OFF) IF (${LIBRARY_NAME}_BUILD_SHARED) SET(${LIBRARY_NAME}_SHARED SHARED) CREA_DEFINE(${LIBRARY_NAME}_BUILD_SHARED)