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
Mathis Logemann
59f7a61661
[CMake] unit-test copy more data
2021-10-09 14:11:58 +02:00
Mathis Logemann
ba8a972254
[unit-test] fix formatting
2021-10-09 13:55:32 +02:00
Mathis Logemann
05c2278893
[CMake] add the search paths for the build executables automatically for ctest.; depend completly on the external catch2
2021-10-09 13:48:11 +02:00
Mathis Logemann
a73d2f7d94
[unit-tests] fix windows 11 path search
2021-10-09 13:46:55 +02:00
Mathis Logemann
bf6081b207
[unit-test] add std includes for external catch2
2021-10-09 13:46:24 +02:00
Mathis Logemann
ac95449ff5
[CMake] fix critical webp init
2021-10-09 09:40:44 +02:00
Mathis Logemann
56e8de6b16
[CMake] proj remove global
2021-10-09 08:44:03 +02:00
Mathis Logemann
1a5aea5653
[CMake] use pkgconf imported target for proj; see https://github.com/mapnik/mapnik/issues/4249#issuecomment-937214705
2021-10-08 20:21:18 +02:00
Mathis Logemann
a0525ddd26
[CMake] nativ harfbuzz don't publish a version. Therefore we can't depend on it. 4645c3b47c/CMakeLists.txt (L686) and following
2021-10-07 20:16:45 +02:00
Mathis Logemann
8714432a67
[viewer] fix qt6
2021-10-07 20:05:11 +02:00
Artem Pavlenko
d96b6843b3
Merge pull request #4251 from mathisloge/cmake_hotfix
...
[CMake] fix `mapnik_find_plugin_dir`
2021-10-06 16:10:11 +01:00
Mathis Logemann
95e210521c
[CMake] fix mapnik_find_plugin_dir
2021-10-06 16:43:55 +02:00
Artem Pavlenko
6f01d7a34a
Merge pull request #4250 from mathisloge/boost_bump_1_73
...
bump boost version to 1.73 and fix docs
2021-10-06 14:23:05 +01:00
Mathis Logemann
feca084ed6
bump boost version to 1.73 and fix docs
2021-10-06 15:15:32 +02:00
Artem Pavlenko
a1a3a712dd
Merge pull request #4248 from mathisloge/cmake-fix
...
[CMake] Simplify install, add min versions and PkgConfig
2021-10-06 10:28:21 +01:00
Mathis Logemann
333e745d7b
[CMake] pkg-config: generate correct library link file names
2021-10-01 20:42:57 +02:00
Mathis Logemann
8c83e15404
[CMake] fix export plugin file naming
2021-09-23 19:28:40 +02:00
Mathis Logemann
fa2fec338b
[CMake] add import prefix for libmapnik
...
so that the resulting archive is also named libmapnik
2021-09-23 19:11:29 +02:00
Mathis Logemann
fcc7016124
add basic pkg-config exports
2021-09-23 18:46:48 +02:00
Mathis Logemann
a2d3364ec7
[CMake] add version and soversion to base libraries
2021-09-23 10:41:25 +02:00
Mathis Logemann
1c51a8e529
[CMake] add configuration dependend exports for plugin install dir.
...
add function to get the current plugin install dir
2021-09-23 10:33:32 +02:00
Mathis Logemann
5287c234d6
[CMake] fix resulting config when no plugins are build
2021-09-22 21:39:04 +02:00
Mathis Logemann
f1ed49edec
install utilities
2021-09-22 20:49:44 +02:00
Mathis Logemann
35ea6f2a56
[CMake] refactor mapnik_install
2021-09-22 19:52:39 +02:00
Mathis Logemann
d57f0ac93a
[Cmake] Fix cache description
2021-09-22 15:44:34 +02:00
Mathis Logemann
755e8d322e
add minimum versions; proj include dir only as a build interface
2021-09-22 15:25:55 +02:00
Mathis Logemann
25774ac82a
[CMake] unify and simplify install commands.; Add Components to targets
2021-09-22 14:41:50 +02:00
Mathis Logemann
9d4d7fd273
[CMake] do not print install targets
2021-09-22 13:19:43 +02:00
Artem Pavlenko
1ccbbf95b5
Merge pull request #4244 from mathisloge/cmake-pub-dep
...
[CMake] make mapnik::core a public dependency of mapnik::mapnik
2021-09-15 16:38:23 +01:00
Mathis Logemann
8bd463d4fc
make mapnik::core a public dependency of mapnik::mapnik
2021-09-14 20:46:43 +02:00
Artem Pavlenko
737e7a69c2
Add includes required for building with boost_1_77 ( 46e3d9231c (diff-2eb9871858184271f07935b31093c2d9f70f7a219979bec85adc03db6721a182))
2021-09-01 10:11:13 +01:00
Artem Pavlenko
69911ad9ea
Merge pull request #4191 from mathisloge/cmake-support
...
CMake build support
2021-08-30 09:44:14 +01:00
