Merge pull request KjellKod#47 from ctapmex/disable_shared

add option ADD_BUILD_SHARED
xgdgsc · Sep 6, 2015 · 70f6cc2 · 70f6cc2
2 parents ef27722 + 0a04ae2
commit 70f6cc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Build.cmake b/Build.cmake
@@ -82,16 +82,18 @@ ENDIF()
    add_library(g3logger ${SRC_FILES})
    set_target_properties(g3logger PROPERTIES LINKER_LANGUAGE CXX)
    target_link_libraries(g3logger ${PLATFORM_LINK_LIBRIES})
+   SET(G3LOG_LIBRARY g3logger)
 
+if(ADD_BUILD_WIN_SHARED OR NOT(MSVC OR MINGW))
    add_library(g3logger_shared SHARED ${SRC_FILES})
    set_target_properties(g3logger_shared PROPERTIES LINKER_LANGUAGE CXX)
    IF(APPLE)
       set_target_properties(g3logger_shared PROPERTIES MACOSX_RPATH TRUE)
    ENDIF(APPLE)
    target_link_libraries(g3logger_shared ${PLATFORM_LINK_LIBRIES})   
-  
+
    SET(G3LOG_SHARED_LIBRARY g3logger_shared)
-   SET(G3LOG_LIBRARY g3logger)
+endif()
 
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,6 +77,8 @@ endif()
    #==========================================================================
    INCLUDE (${g3log_SOURCE_DIR}/GenerateMacroDefinitionsFile.cmake)
 
+   option (ADD_BUILD_WIN_SHARED  "Build shared library on Windows" OFF)
+
    # =========================================================================
    # G3LOG BUILD
    #==========================================================================