sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4251 from mathisloge/cmake_hotfix

Browse source 
[CMake] fix `mapnik_find_plugin_dir`
This commit is contained in:
Artem Pavlenko 2021-10-06 16:10:11 +01:00 committed by GitHub
commit d96b6843b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/mapnikConfig.cmake.in
View file

@ -28,11 +28,11 @@ endforeach()
function(mapnik_find_plugin_dir PLUGIN_DIR) function(mapnik_find_plugin_dir PLUGIN_DIR)
string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type_l) string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type_l)
set(_plugin_dir "${MAPNIK_PLUGINS_DIR_${_build_config}}") set(_plugin_dir "${MAPNIK_PLUGINS_DIR_${_build_type_l}}")
# only release has more then one configuration # only release has more then one configuration
if(NOT _plugin_dir) if(NOT _plugin_dir)
set(_all_rel_cfgs RELEASE RELWITHDEBINFO MINSIZEREL) set(_all_rel_cfgs RELEASE RELWITHDEBINFO MINSIZEREL)
list(FIND _all_rel_cfgs ${_build_config} _is_rel_cfg) list(FIND _all_rel_cfgs ${_build_type_l} _is_rel_cfg)
# check if the current configuration is a known release configuration # check if the current configuration is a known release configuration
if(${_is_rel_cfg} GREATER_EQUAL 0) if(${_is_rel_cfg} GREATER_EQUAL 0)
foreach(_rel_cfg IN LISTS _all_rel_cfgs) foreach(_rel_cfg IN LISTS _all_rel_cfgs)