fix static build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c59bfe3b9464c33e5889abf9f4e1f10024c7c1aa..12d0ec9ed36c8a3fbfce896358c04d21b1019904 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,9 @@ target_include_directories(onig PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 
+target_compile_definitions(onig PUBLIC
+  $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:ONIG_STATIC>)
+
 if(MSVC)
   target_compile_options(onig PRIVATE
        #/W4
@@ -75,7 +78,6 @@ if(MSVC)
          $<$<CONFIG:MinSizeRel>:/MT>
          $<$<CONFIG:RelWithDebgInfo>:/MTd>
          )
-       target_compile_definitions(onig PUBLIC -DONIG_STATIC)
   endif()
 elseif(CMAKE_COMPILER_IS_GNUCC)
   target_compile_options(onig PRIVATE

diff --git a/src/onigposix.h b/src/onigposix.h
index 324069c525780ffdee4bba5e76a8b112f5d6ca10..5ff779fd9b9dd877467572beacafa0f57006bda8 100644 (file)
--- a/src/onigposix.h
+++ b/src/onigposix.h
@@ -95,6 +95,7 @@ typedef struct {
 #endif
 #endif
 
+#ifndef ONIG_STATIC
 #ifndef ONIG_EXTERN
 #if defined(_WIN32) && !defined(__GNUC__)
 #if defined(ONIGURUMA_EXPORT)
@@ -108,6 +109,9 @@ typedef struct {
 #ifndef ONIG_EXTERN
 #define ONIG_EXTERN   extern
 #endif
+#else
+#define ONIG_EXTERN   extern
+#endif
 
 #ifndef ONIGURUMA_H
 typedef unsigned int        OnigOptionType;