script_core 0.2.0 → 0.2.5

data/ext/enterprise_script_service/mruby/tasks/doc.rake

@@ -25,12 +25,12 @@
 
 desc 'clean all built docs'
 task :clean_api_doc do
-  FileUtils.rm_rf 'doc/api'
+  rm_rf 'doc/api'
 end
 
 desc 'clean all built docs'
 task :clean_capi_doc do
-  FileUtils.rm_rf 'doc/capi'
+  rm_rf 'doc/capi'
 end
 
 desc 'clean all built docs'

data/ext/enterprise_script_service/mruby/tasks/gitlab.rake

@@ -80,7 +80,7 @@ def run_cmd(cmd)
             _info += int_conf['16'] ? 'int16 ' : ''
             _info += int_conf['64'] ? 'int64 ' : ''
             _info += boxing_conf['NAN'] ? 'nan ' : ''
-            _info += boxing_conf['word'] ? 'word ' : ''
+            _info += boxing_conf['WORD'] ? 'word ' : ''
             _info += utf8_conf['UTF8'] ? 'utf8 ' : ''
             _info = _info.gsub(/ +/, ' ').strip.tr(' ', '_')
             configs << { '_info' => _info, 'CFLAGS' => "#{bit}#{env}", 'LDFLAGS' => bit.strip.to_s }
@@ -110,7 +110,7 @@ def run_cmd(cmd)
         'stage' => 'test',
         'image' => ci_docker_tag(compiler),
         'variables' => hash,
-        'script' => 'env; ./minirake --verbose all test'
+        'script' => 'env; rake --verbose all test'
       }
     end
   end

data/ext/enterprise_script_service/mruby/tasks/libmruby.rake

@@ -4,7 +4,7 @@
   end
 
   file "#{build_dir}/lib/libmruby.flags.mak" => [__FILE__, libmruby_static] do |t|
-    FileUtils.mkdir_p File.dirname t.name
+    mkdir_p File.dirname t.name
     open(t.name, 'w') do |f|
       f.puts "MRUBY_CFLAGS = #{cc.all_flags}"
 

data/ext/enterprise_script_service/mruby/tasks/mrbgems.rake

@@ -8,7 +8,7 @@
     self.libmruby_objs << objfile("#{build_dir}/mrbgems/gem_init")
     file objfile("#{build_dir}/mrbgems/gem_init") => ["#{build_dir}/mrbgems/gem_init.c", "#{build_dir}/LEGAL"]
     file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG, __FILE__] do |t|
-      FileUtils.mkdir_p "#{build_dir}/mrbgems"
+      mkdir_p "#{build_dir}/mrbgems"
       open(t.name, 'w') do |f|
         gem_func_gems = gems.select { |g| g.generate_functions }
         gem_func_decls = gem_func_gems.each_with_object('') do |g, s|
@@ -53,7 +53,7 @@
 
   # legal documents
   file "#{build_dir}/LEGAL" => [MRUBY_CONFIG, __FILE__] do |t|
-    FileUtils.mkdir_p File.dirname t.name
+    mkdir_p File.dirname t.name
     open(t.name, 'w+') do |f|
      f.puts <<LEGAL
 Copyright (c) #{Time.now.year} mruby developers

data/ext/enterprise_script_service/mruby/tasks/toolchains/android.rake

@@ -67,7 +67,7 @@ def bin(command)
   end
 
   def home_path
-    @home_path ||= Pathname(
+    @home_path ||= Pathname.new(
       params[:ndk_home] ||
       ENV['ANDROID_NDK_HOME'] ||
       DEFAULT_NDK_HOMES.find { |path|
@@ -124,7 +124,7 @@ def host_platform
         path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*')
         Dir.glob(path.to_s){ |item|
           next if File.file?(item)
-          path = Pathname(item)
+          path = Pathname.new(item)
           break
         }
         path.basename

data/ext/enterprise_script_service/mruby/tasks/toolchains/gcc.rake

@@ -15,7 +15,7 @@
     compiler.option_include_path = '-I%s'
     compiler.option_define = '-D%s'
     compiler.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
-    compiler.cxx_compile_flag = '-x c++ -std=c++03'
+    compiler.cxx_compile_flag = '-x c++ -std=gnu++03'
     compiler.cxx_exception_flag = '-fexceptions'
     compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags
   end

data/ext/enterprise_script_service/mruby/test/t/exception.rb

@@ -352,8 +352,10 @@ def z
   assert_equal [true, true], Class4Exception19.new.a
 end
 
-assert('Exception#inspect without message') do
+assert('Exception#inspect') do
   assert_equal "Exception", Exception.new.inspect
+  assert_equal "Exception", Exception.new("").inspect
+  assert_equal "error! (Exception)", Exception.new("error!").inspect
 end
 
 assert('Exception#backtrace') do

data/ext/enterprise_script_service/mruby/test/t/string.rb

@@ -687,31 +687,45 @@
 end
 
 assert('String#to_f', '15.2.10.5.38') do
-  a = ''.to_f
-  b = '123456789'.to_f
-  c = '12345.6789'.to_f
-  d = '1e-2147483648'.to_f
-  e = '1e2147483648'.to_f
-
-  assert_float(0.0, a)
-  assert_float(123456789.0, b)
-  assert_float(12345.6789, c)
-  assert_float(0, d)
-  assert_float(Float::INFINITY, e)
+  assert_operator(0.0, :eql?, ''.to_f)
+  assert_operator(123456789.0, :eql?, '123456789'.to_f)
+  assert_operator(12345.6789, :eql?, '12345.6789'.to_f)
+  assert_operator(0.0, :eql?, '1e-2147483648'.to_f)
+  assert_operator(Float::INFINITY, :eql?, '1e2147483648'.to_f)
+  assert_operator(0.0, :eql?, 'a'.to_f)
+  assert_operator(4.0, :eql?, '4a5'.to_f)
+  assert_operator(12.0, :eql?, '1_2__3'.to_f)
+  assert_operator(123.0, :eql?, '1_2_3'.to_f)
+  assert_operator(68.0, :eql?, '68_'.to_f)
+  assert_operator(68.0, :eql?, '68._7'.to_f)
+  assert_operator(68.7, :eql?, '68.7_'.to_f)
+  assert_operator(68.7, :eql?, '68.7_ '.to_f)
+  assert_operator(6.0, :eql?, '6 8.7'.to_f)
+  assert_operator(68.0, :eql?, '68. 7'.to_f)
+  assert_operator(0.0, :eql?, '_68'.to_f)
+  assert_operator(0.0, :eql?, ' _68'.to_f)
+  assert_operator(12.34, :eql?, '1_2.3_4'.to_f)
+  assert_operator(12.3, :eql?, '1_2.3__4'.to_f)
+  assert_operator(0.9, :eql?, '.9'.to_f)
+  assert_operator(0.9, :eql?, "\t\r\n\f\v .9 \t\r\n\f\v".to_f)
 end if Object.const_defined?(:Float)
 
 assert('String#to_i', '15.2.10.5.39') do
-  a = ''.to_i
-  b = '32143'.to_i
-  c = 'a'.to_i(16)
-  d = '100'.to_i(2)
-  e = '1_000'.to_i
-
-  assert_equal 0, a
-  assert_equal 32143, b
-  assert_equal 10, c
-  assert_equal 4, d
-  assert_equal 1_000, e
+  assert_operator 0, :eql?, ''.to_i
+  assert_operator 32143, :eql?, '32143'.to_i
+  assert_operator 10, :eql?, 'a'.to_i(16)
+  assert_operator 4, :eql?, '100'.to_i(2)
+  assert_operator 1_000, :eql?, '1_000'.to_i
+  assert_operator 0, :eql?, 'a'.to_i
+  assert_operator 4, :eql?, '4a5'.to_i
+  assert_operator 12, :eql?, '1_2__3'.to_i
+  assert_operator 123, :eql?, '1_2_3'.to_i
+  assert_operator 68, :eql?, '68_'.to_i
+  assert_operator 68, :eql?, '68_ '.to_i
+  assert_operator 0, :eql?, '_68'.to_i
+  assert_operator 0, :eql?, ' _68'.to_i
+  assert_operator 68, :eql?, "\t\r\n\f\v 68 \t\r\n\f\v".to_i
+  assert_operator 6, :eql?, ' 6 8 '.to_i
 end
 
 assert('String#to_s', '15.2.10.5.40') do

data/ext/enterprise_script_service/mruby/test/t/syntax.rb

@@ -671,3 +671,13 @@ def m(a: b = 1, c:) [a, b, c] end
   assert_equal([1, 1, :c], m(c: :c))
   assert_equal([:a, nil, :c], m(a: :a, c: :c))
 end
+
+assert('numbered parameters') do
+  assert_equal(15, [1,2,3,4,5].reduce {_1+_2})
+  assert_equal(45, Proc.new do _1 + _2 + _3 + _4 + _5 + _6 + _7 + _8 + _9 end.call(*[1, 2, 3, 4, 5, 6, 7, 8, 9]))
+end
+
+assert('_0 is not numbered parameter') do
+  _0 = :l
+  assert_equal(:l, ->{_0}.call)
+end

data/ext/enterprise_script_service/mruby/test/t/vformat.rb

@@ -1,25 +1,4 @@
-def assert_format(exp, args)
-  assert_equal(exp, TestVFormat.format(*args))
-end
-
-def assert_format_pattern(exp_pattern, args)
-  assert_match(exp_pattern, TestVFormat.format(*args))
-end
-
-# Pass if ArgumentError is raised or return value is +exp+.
-def assert_implementation_dependent(exp, args)
-  begin
-    ret = TestVFormat.format(*args)
-  rescue ArgumentError
-    return pass
-  end
-  if ret == exp
-    pass
-  else
-    flunk "", "Expected ArgumentError is raised or #{ret.inspect} to be #{exp}."
-  end
-end
-
+# coding: utf-8-emacs
 def sclass(v)
   class << v
     self
@@ -27,66 +6,53 @@ class << v
 end
 
 assert('mrb_vformat') do
-  n = TestVFormat::Native
-  assert_format '', ['']
-  assert_format 'No specifier!', ['No specifier!']
-  assert_format '`c`: C', ['`c`: %c', n.c(?C)]
-  assert_format '`d`: 123', ['`d`: %d', n.d(123)]
-  assert_format '`d`: -79', ['`d`: %d', n.d(-79)]
-  assert_format '`i`: 514', ['`i`: %i', n.i(514)]
-  assert_format '`i`: -83', ['`i`: %i', n.i(-83)]
-  assert_format '`t`: NilClass', ['`t`: %t', nil]
-  assert_format '`t`: FalseClass', ['`t`: %t', false]
-  assert_format '`t`: TrueClass', ['`t`: %t', true]
-  assert_format '`t`: Fixnum', ['`t`: %t', 0]
-  assert_format '`t`: Hash', ['`t`: %t', k: "value"]
-  assert_format_pattern '#<Class:#<Class:#<Hash:0x*>>>', ['%t', sclass({})]
-#  assert_format 'string and length', ['string %l length', n.s('andante'), n.l(3)]
-  assert_format '`n`: sym', ['`n`: %n', n.n(:sym)]
-  assert_format '%C文字列%', ['%s', n.s('%C文字列%')]
-  assert_format '`C`: Kernel module', ['`C`: %C module', n.C(Kernel)]
-  assert_format '`C`: NilClass', ['`C`: %C', n.C(nil.class)]
-  assert_format_pattern '#<Class:#<String:0x*>>', ['%C', n.C(sclass(""))]
-  assert_format '`T`: NilClass', ['`T`: %T', nil]
-  assert_format '`T`: FalseClass', ['`T`: %T', false]
-  assert_format '`T`: TrueClass', ['`T`: %T', true]
-  assert_format '`T`: Fixnum', ['`T`: %T', 0]
-  assert_format '`T`: Hash', ['`T`: %T', k: "value"]
-  assert_format_pattern 'Class', ['%T', sclass({})]
-  assert_format '`Y`: nil', ['`Y`: %Y', nil]
-  assert_format '`Y`: false', ['`Y`: %Y', false]
-  assert_format '`Y`: true', ['`Y`: %Y', true]
-  assert_format '`Y`: Fixnum', ['`Y`: %Y', 0]
-  assert_format '`Y`: Hash', ['`Y`: %Y', k: "value"]
-  assert_format 'Class', ['%Y', sclass({})]
-  assert_format_pattern '#<Class:#<String:0x*>>', ['%v', sclass("")]
-  assert_format '`v`: 1...3', ['`v`: %v', 1...3]
-  assert_format '`S`: {:a=>1, "b"=>"c"}', ['`S`: %S', a: 1, "b" => ?c]
-  assert_format 'percent: %', ['percent: %%']
-  assert_format '"I": inspect char', ['%!c: inspect char', n.c(?I)]
-  assert_format '709: inspect mrb_int', ['%!d: inspect mrb_int', n.i(709)]
-#  assert_format '"a\x00b\xff"', ['%!l', n.s("a\000b\xFFc\000d"), n.l(4)]
-  assert_format ':"&.": inspect symbol', ['%!n: inspect symbol', n.n(:'&.')]
-  assert_format 'inspect "String"', ['inspect %!v', 'String']
-  assert_format 'inspect Array: [1, :x, {}]', ['inspect Array: %!v', [1,:x,{}]]
-  assert_format_pattern '`!C`: #<Class:0x*>', ['`!C`: %!C', n.C(Class.new)]
-  assert_format 'to_s -> to_s: ab,cd', ['to_s -> to_s: %n,%v', n.n(:ab), 'cd']
-  assert_format 'to_s -> inspect: x:y', ['to_s -> inspect: %v%!v', 'x', :y]
-  assert_format 'inspect -> to_s: "a"b', ['inspect -> to_s: %!v%n', 'a', n.n(:b)]
-  assert_format 'Y -> to_s: nile', ['Y -> to_s: %Y%v', nil, "e"]
-  assert_format '"abc":Z', ['%!s%!n', n.s('abc'), n.n('Z'.to_sym)]
-  assert_format 'escape: \\%a,b,c,d', ['escape: \\\\\%a,b,\c%v', ',d']
-
-  assert_implementation_dependent 'unknown specifier: %^',
-                                  ['unknown specifier: %^']
-  assert_implementation_dependent 'unknown specifier with modifier: %!^',
-                                  ['unknown specifier with modifier: %!^']
-  assert_implementation_dependent 'termination is \\', ['termination is \\']
-  assert_implementation_dependent 'termination is %', ['termination is %']
-  assert_implementation_dependent 'termination is %!', ['termination is %!']
+  vf = TestVFormat
+  assert_equal '', vf.z('')
+  assert_equal 'No specifier!', vf.z('No specifier!')
+  assert_equal '`c`: C', vf.c('`c`: %c', ?C)
+  assert_equal '`d`: 123', vf.d('`d`: %d', 123)
+  assert_equal '`d`: -79', vf.d('`d`: %d', -79)
+  assert_equal '`i`: 514', vf.i('`i`: %i', 514)
+  assert_equal '`i`: -83', vf.i('`i`: %i', -83)
+  assert_equal '`t`: NilClass', vf.v('`t`: %t', nil)
+  assert_equal '`t`: FalseClass', vf.v('`t`: %t', false)
+  assert_equal '`t`: TrueClass', vf.v('`t`: %t', true)
+  assert_equal '`t`: Fixnum', vf.v('`t`: %t', 0)
+  assert_equal '`t`: Hash', vf.v('`t`: %t', {k: "value"})
+  assert_match '#<Class:#<Class:#<Hash:0x*>>>', vf.v('%t', sclass({}))
+  assert_equal 'string and length', vf.l('string %l length', 'andante', 3)
+  assert_equal '`n`: sym', vf.n('`n`: %n', :sym)
+  assert_equal '%C文字列����%', vf.s('%s', '%C文字列����%')
+  assert_equal '`C`: Kernel module', vf.C('`C`: %C module', Kernel)
+  assert_equal '`C`: NilClass', vf.C('`C`: %C', nil.class)
+  assert_match '#<Class:#<String:0x*>>', vf.C('%C', sclass(""))
+  assert_equal '`T`: NilClass', vf.v('`T`: %T', nil)
+  assert_equal '`T`: FalseClass', vf.v('`T`: %T', false)
+  assert_equal '`T`: TrueClass', vf.v('`T`: %T', true)
+  assert_equal '`T`: Fixnum', vf.v('`T`: %T', 0)
+  assert_equal '`T`: Hash', vf.v('`T`: %T', {k: "value"})
+  assert_match 'Class', vf.v('%T', sclass({}))
+  assert_equal '`Y`: nil', vf.v('`Y`: %Y', nil)
+  assert_equal '`Y`: false', vf.v('`Y`: %Y', false)
+  assert_equal '`Y`: true', vf.v('`Y`: %Y', true)
+  assert_equal '`Y`: Fixnum', vf.v('`Y`: %Y', 0)
+  assert_equal '`Y`: Hash', vf.v('`Y`: %Y', {k: "value"})
+  assert_equal 'Class', vf.v('%Y', sclass({}))
+  assert_match '#<Class:#<String:0x*>>', vf.v('%v', sclass(""))
+  assert_equal '`v`: 1...3', vf.v('`v`: %v', 1...3)
+  assert_equal '`S`: {:a=>1, "b"=>"c"}', vf.v('`S`: %S', {a: 1, "b" => ?c})
+  assert_equal 'percent: %', vf.z('percent: %%')
+  assert_equal '"I": inspect char', vf.c('%!c: inspect char', ?I)
+  assert_equal '709: inspect mrb_int', vf.i('%!d: inspect mrb_int', 709)
+  assert_equal '"a\x00b\xff"', vf.l('%!l', "a\000b\xFFc\000d", 4)
+  assert_equal ':"&.": inspect symbol', vf.n('%!n: inspect symbol', :'&.')
+  assert_equal 'inspect "String"', vf.v('inspect %!v', 'String')
+  assert_equal 'inspect Array: [1, :x, {}]', vf.v('inspect Array: %!v', [1,:x,{}])
+  assert_match '`!C`: #<Class:0x*>', vf.C('`!C`: %!C', Class.new)
+  assert_equal 'escape: \\%a,b,c,d', vf.v('escape: \\\\\%a,b,\c%v', ',d')
 
   skip unless Object.const_defined?(:Float)
-  assert_format '`f`: 0.0125', ['`f`: %f', n.f(0.0125)]
-  assert_format '-Infinity', ['%f', n.f(-Float::INFINITY)]
-  assert_format 'NaN: Not a Number', ['%f: Not a Number', n.f(Float::NAN)]
+  assert_equal '`f`: 0.0125', vf.f('`f`: %f', 0.0125)
+  assert_equal '-Infinity', vf.f('%f', -Float::INFINITY)
+  assert_equal 'NaN: Not a Number', vf.f('%f: Not a Number', Float::NAN)
 end

data/ext/enterprise_script_service/mruby/travis_config.rb

@@ -18,7 +18,8 @@
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines += %w(MRB_ENABLE_DEBUG_HOOK)
+  conf.cc.flags += %w(-Werror=declaration-after-statement)
+  conf.cc.defines += %w(MRB_GC_STRESS MRB_METHOD_CACHE MRB_ENABLE_DEBUG_HOOK)
 
   conf.enable_test
 end

data/ext/enterprise_script_service/mruby_config.rb

@@ -38,6 +38,12 @@
 MRuby::CrossBuild.new("sandbox") do |conf|
   toolchain(:gcc)
 
+  begin
+    conf.host_target = `gcc -dumpmachine`.strip
+  rescue Errno::ENOENT
+    puts "Run `gcc -dumpmachine` failed, unable to obtain arch info, will not set `host_target`"
+  end
+
   enable_debug
 
   conf.gembox(mruby_engine_gembox_path)

data/ext/enterprise_script_service/msgpack/.travis.yml

@@ -232,6 +232,25 @@ matrix:
             - clang-5.0
       script:
         - CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}" GTEST_ROOT="${BASE}/gtest" BOOST_ROOT="${BASE}/boost" CTEST_OUTPUT_ON_FAILURE=1 MSGPACK_SAN="${SAN}" ci/build_regression.sh
+    - os: linux
+      compiler: gcc
+      env: ACTION="ci/build_cmake_embedded.sh"     ARCH="64"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-multilib
+            - gcc-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
+            - lib32stdc++6-6-dbg
+            - lib32gcc1
+            - libc6-i386
+            - lib32z1-dev
+            - zlib1g-dev
+            - bzip2
+            - libc6-dbg
 
 
 script:

data/ext/enterprise_script_service/msgpack/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2019-12-10 version 3.2.1
+  * Fix snprintf return value checking (#821)
+  * Remove some warnings (#819)
+  * Fix fbuffer result checking (#812)
+  * Fix temporary object handling (#807)
+  * Improve cmake support (#804)
+  * Fix invalid `int main` parameter (#800)
+  * Improve supporting platform (#797, #817)
+  * Fix ZLIB error handling (#795)
+  * Remove unused variable (#793)
+  * Improve integer overflow checking (#792)
+
 # 2019-05-27 version 3.2.0
 
   * Fix invalid include (#783)

data/ext/enterprise_script_service/msgpack/CMakeLists.txt

@@ -181,6 +181,7 @@ ELSE ()
     IF (NOT DEFINED MSGPACK_ENABLE_STATIC)
         SET (MSGPACK_ENABLE_STATIC ON)
     ENDIF ()
+    SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED})
 ENDIF ()
 
 OPTION (MSGPACK_ENABLE_CXX "Enable C++ interface." ON)
@@ -209,8 +210,9 @@ CONFIGURE_FILE (
     @ONLY
 )
 
-IF (MSGPACK_ENABLE_SHARED)
-    ADD_LIBRARY (msgpackc SHARED
+
+IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
+    ADD_LIBRARY (msgpackc
         ${msgpackc_SOURCES}
         ${msgpackc_HEADERS}
     )
@@ -238,7 +240,7 @@ IF (MSGPACK_ENABLE_CXX AND ((CMAKE_VERSION VERSION_GREATER 3.0) OR (CMAKE_VERSIO
     )
 ENDIF ()
 
-IF (MSGPACK_ENABLE_STATIC)
+IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
     ADD_LIBRARY (msgpackc-static STATIC
         ${msgpackc_SOURCES}
         ${msgpackc_HEADERS}
@@ -253,11 +255,6 @@ IF (MSGPACK_ENABLE_STATIC)
             ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
-    IF (NOT MSGPACK_ENABLE_SHARED)
-        # Add alias for subdirectories
-        ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
-    ENDIF ()
-
     SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
 
     IF (MSGPACK_ENABLE_SHARED)
@@ -291,19 +288,19 @@ IF (MSGPACK_BUILD_TESTS)
 ENDIF ()
 
 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    IF (MSGPACK_ENABLE_SHARED)
+    IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
     ENDIF ()
-    IF (MSGPACK_ENABLE_STATIC)
+    IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
     ENDIF ()
 ENDIF ()
 
 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    IF (MSGPACK_ENABLE_SHARED)
+    IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
     ENDIF ()
-    IF (MSGPACK_ENABLE_STATIC)
+    IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
         SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
     ENDIF ()
 ENDIF ()
@@ -337,7 +334,7 @@ IF (MSGPACK_BUILD_EXAMPLES)
     ADD_SUBDIRECTORY (example)
 ENDIF ()
 
-IF (MSGPACK_ENABLE_SHARED)
+IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
     SET (MSGPACK_INSTALLTARGETS msgpackc)
 ENDIF ()
 
@@ -345,7 +342,7 @@ IF (MSGPACK_ENABLE_CXX AND ((CMAKE_VERSION VERSION_GREATER 3.0) OR (CMAKE_VERSIO
     LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-cxx)
 ENDIF ()
 
-IF (MSGPACK_ENABLE_STATIC)
+IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
     LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
 ENDIF ()