diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2019-11-29 11:26:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2019-11-29 11:26:57 +0100 |
| commit | 7f4e90f2759d6a15812172ee19f3ad5b58940beb (patch) | |
| tree | 5f90c63b8ba73f4ecd23d6e642c1ab34dccea033 /CMakeLists.txt | |
| parent | 68d1ec60c90d27c511d51ce0bef44b132a7ddf11 (diff) | |
| parent | 7e149a97d276ce3b4c5e34f965766c8e40e03fef (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c59bfe3..bce888a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) project(oniguruma - VERSION 6.9.3 + VERSION 6.9.4 LANGUAGES C) set(PACKAGE onig) @@ -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 |