Mathis Logemann
e7c3d04309
format dir include and src
...
format all files
Revert "format all files"
This reverts commit 95d5812e49e7f916b68e786596f5a8eb5bcac414.
Revert "format some files"
This reverts commit ed3c8762d4d828b2b28e7b18809fc33f4f8ccaf5.
format all files
fix formatting in dir include
fix formatting of debug macro
2022-01-27 00:12:08 +01:00
Mathis Logemann
6fe46f61e2
add clang-format
...
fix clang-format
fix clang-format
adjust pointer and reference aligment
add cmake script to format all files run with: cmake -P cmake/clang-format.cmake
fix sort includes
change format cmake script
2022-01-26 23:36:12 +01:00
Mathis Logemann
61dd5dccab
Merge branch 'master' of https://github.com/mapnik/mapnik
2022-01-26 00:13:21 +01:00
Artem Pavlenko
1d6350b1e5
Merge pull request #4281 from mathisloge/fix/unique_shared_ptr
...
use shared::ptr<T>::use_count instead of unique()
2022-01-25 12:09:52 +00:00
Mathis Logemann
9ac35a0a9c
use use_count instead of unique()
...
This should be safe to use, since there aren't any weak_ptr's using the shared_ptr. Furthermore any async operations should be finished or guarded for multithreaded execution.
2022-01-25 10:21:27 +01:00
Artem Pavlenko
9e3bafcd4c
Merge pull request #4279 from mathisloge/fix/issue-4268
...
fix #4268 by adding mapped_memory_file
2022-01-25 08:54:50 +00:00
Mathis Logemann
a3ccf2967f
[scons] add mapped_memory_file to source list
2022-01-24 21:21:45 +01:00
Artem Pavlenko
611fd93308
Merge pull request #4280 from mathisloge/feature/vcpkg
...
add vpkg.json manifest file
2022-01-24 17:04:17 +00:00
Mathis Logemann
c16aa1e5c4
add vpkg.json
2022-01-24 10:49:07 +01:00
Mathis Logemann
fe887a2c83
fix #4268 by adding mapped_memory_file
2022-01-24 10:45:32 +01:00
Mathis Logemann
26052486ee
remove cxx11_support.hpp
2022-01-20 23:07:17 +01:00
Artem Pavlenko
fb06428250
Merge pull request #4275 from mathisloge/remove_make_unique_cpp11
2022-01-19 13:52:39 +00:00
Mathis Logemann
4f95463c75
remove make_unique
2022-01-19 12:42:52 +01:00
Artem Pavlenko
cf5541d180
Merge pull request #4272 from mathisloge/cite
...
add CITATION.cff
2021-12-14 11:44:10 +00:00
Mathis Logemann
3c2aff82bc
add CITATION.cff
2021-12-14 10:49:22 +01:00
Artem Pavlenko
79901e494b
Merge pull request #4271 from mathisloge/fix/cmake_install
...
[CMake] do not install FindHarfbuzz.cmake
2021-12-03 14:02:53 +00:00
Mathis Logemann
7a1b441cf0
[CMake] do not install FindHarfbuzz.cmake
2021-12-03 14:48:13 +01:00
Artem Pavlenko
6d47d3b70f
Merge pull request #4270 from mathisloge/fix/cmake-proj
...
fix proj version detection / harfbuzz pkg-config for cmake
2021-12-03 10:54:29 +00:00
Mathis Logemann
d546cda6d5
[CMake] drop harfbuzz and use pkg-config as a backup
2021-11-20 12:53:58 +01:00
Mathis Logemann
eb4390b5a6
fix proj version detection for cmake
2021-11-19 20:04:22 +01:00
Mathis Logemann
92b1dbaf32
delete all data
2021-11-15 16:41:37 +01:00
Mathis Logemann
c5d3d9c188
wip
2021-11-15 16:39:10 +01:00
Mathis Logemann
c6619d042c
check out correctly
2021-11-15 16:09:46 +01:00
Mathis Logemann
7195448334
all branches
2021-11-15 16:08:48 +01:00
Mathis Logemann
500728e51f
test workflow
2021-11-15 16:08:27 +01:00
Mathis Logemann
4b66137654
initial docker
2021-11-15 15:32:58 +01:00
Artem Pavlenko
14f913d6ab
Merge pull request #4266 from mathisloge/cmake_improvments
...
[CMake] improve build structure
2021-11-15 14:21:13 +00:00
Mathis Logemann
a911e33d7b
[CMake] add more build presets
...
[CMake] rename windows presets
Revert "[CMake] rename windows presets"
This reverts commit 381dcd606c0c8f4281a482ede0c8c4a9a6d912fa.
[CMake] rename windows presets
2021-11-15 11:30:59 +01:00
Mathis Logemann
fbb0ae1489
[CMake] fix building with zero plugins
...
[Cmake] fix null plugins
fix null
2021-11-15 00:55:58 +01:00
Mathis Logemann
7a7a8125a9
[CMake] remove obsolete statements/improve docs
...
[CMake] remove obsolete variables and improve docs
[CMake] remove proj env var
2021-11-15 00:40:48 +01:00
Mathis Logemann
f0940c2075
[CMake] move all build artifacts into same dir to remove the need of copy_dlls (except for plugins)
...
[CMake] improve BUILD_TESTING and use pkgconf for cairo on linux
[CMake] add Threads dependency to -Config
2021-11-15 00:40:47 +01:00
Artem Pavlenko
dc5f497495
catch.hpp - upgrade to v2.13.7 (to unlock c++20 support)
2021-11-02 14:16:07 +00:00
Artem Pavlenko
4eb38c1051
Merge pull request #4260 from mathisloge/windows_define
...
replace _WINDOWS with _WIN32
2021-10-25 10:25:50 +01:00
Mathis Logemann
e626ba2688
replace _WINDOWS with _WIN32
2021-10-21 18:22:53 +02:00
Artem Pavlenko
f2ab25cf98
Merge pull request #4257 from mathisloge/cmake-pkgconf-improv
...
[CMake] improve pkg-config export
2021-10-20 16:08:47 +01:00
Mathis Logemann
aa903c675f
[CMake] improve pkg-config export
...
add needed libs
pkg-conf: move libmapnikjson and libmapnikjson to m_requires
make pkg multi config aware
update proj min ver
correct prefix
use the correct output name
add import prefixes, just in case
2021-10-20 16:23:04 +02:00
Artem Pavlenko
4695c42b51
Merge pull request #4253 from GimpMaster/master
...
Compile for vcpkg using VS2017
2021-10-18 15:18:48 +01:00
Artem Pavlenko
28378b81e8
Merge pull request #4254 from mathisloge/cmake_option_fix
...
[CMake] fix mapnik_option
2021-10-18 10:40:01 +01:00
Mathis Logemann
c551ed3a62
[CMake] fix mapnik_option
2021-10-16 08:31:19 +02:00
Mathis Logemann
aef71dbae5
[CMake] fix mapnik_option
2021-10-16 08:27:09 +02:00
Joshua Hintze
cab3ba345c
-Removed unneeded macro escapes
2021-10-15 19:33:50 -06:00
Joshua Hintze
15798e6ebb
-Fixed issue with VS2017 compiling
2021-10-15 19:31:45 -06:00
Artem Pavlenko
0edb018465
Merge pull request #4252 from mathisloge/cmake_mapnik_config
...
[CMake] Fix issues with tests, boost-regex and webp. Fix viewer qt6
2021-10-13 17:02:16 +01:00
Mathis Logemann
a89447686c
remove mapnik-config
2021-10-13 17:47:38 +02:00
Mathis Logemann
5ef2e27e8e
[CMake] add boost regex icu check
2021-10-13 10:16:39 +02:00
Mathis Logemann
01dccee231
Merge branch 'cmake_mapnik_config' of https://github.com/mathisloge/mapnik into cmake_mapnik_config
2021-10-13 09:04:31 +02:00
Mathis Logemann
83b4989bd4
[CMake] restore compability with 3.15
2021-10-13 09:04:26 +02:00
Mathis Logemann
561a79720e
[CMake] unit-test add utilities to path
2021-10-12 23:00:48 +02:00
Mathis Logemann
6dee79f442
[CMake] mapnik::mapnik restructure. should give a better overview
2021-10-11 19:08:25 +02:00
Mathis Logemann
dea63374f4
[CMake] better logging of feature options. Output log files for better help management. ; get started with mapnik-config
2021-10-10 21:34:15 +02:00
