diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2021-04-26 17:45:59 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2021-04-26 17:45:59 +0200 |
commit | ddebf6f9bc11c3a23c5b3b3598fb913c328e2352 (patch) | |
tree | 585328f4ed04955626c3d2cac5db64f1726260ea /CMakeLists.txt | |
parent | 77a04959299aa252579a98655e626d1b8f5f9f34 (diff) | |
parent | f5b2920f12628bb7a0fb8b13097533878a1a9936 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 06af497..1944037 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) project(oniguruma - VERSION 6.9.6 + VERSION 6.9.7 LANGUAGES C) set(PACKAGE onig) @@ -100,6 +100,12 @@ if(MSVC) $<$<CONFIG:RelWithDebgInfo>:/MTd> ) endif() + if(MSVC_VERSION LESS_EQUAL "1800") + # <= VS2013 + target_compile_definitions(onig PRIVATE + -Dinline=__inline + ) + endif() elseif(CMAKE_COMPILER_IS_GNUCC) target_compile_options(onig PRIVATE -Wall |