Skip to content

Commit 70f6cc2

Browse files
author
Kjell Hedstrom
committed
Merge pull request #47 from ctapmex/disable_shared
add option ADD_BUILD_SHARED
2 parents ef27722 + 0a04ae2 commit 70f6cc2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Build.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,18 @@ ENDIF()
8282
add_library(g3logger ${SRC_FILES})
8383
set_target_properties(g3logger PROPERTIES LINKER_LANGUAGE CXX)
8484
target_link_libraries(g3logger ${PLATFORM_LINK_LIBRIES})
85+
SET(G3LOG_LIBRARY g3logger)
8586

87+
if(ADD_BUILD_WIN_SHARED OR NOT(MSVC OR MINGW))
8688
add_library(g3logger_shared SHARED ${SRC_FILES})
8789
set_target_properties(g3logger_shared PROPERTIES LINKER_LANGUAGE CXX)
8890
IF(APPLE)
8991
set_target_properties(g3logger_shared PROPERTIES MACOSX_RPATH TRUE)
9092
ENDIF(APPLE)
9193
target_link_libraries(g3logger_shared ${PLATFORM_LINK_LIBRIES})
92-
94+
9395
SET(G3LOG_SHARED_LIBRARY g3logger_shared)
94-
SET(G3LOG_LIBRARY g3logger)
96+
endif()
9597

9698

9799

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ endif()
7777
#==========================================================================
7878
INCLUDE (${g3log_SOURCE_DIR}/GenerateMacroDefinitionsFile.cmake)
7979

80+
option (ADD_BUILD_WIN_SHARED "Build shared library on Windows" OFF)
81+
8082
# =========================================================================
8183
# G3LOG BUILD
8284
#==========================================================================

0 commit comments

Comments
 (0)