diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2022-01-02 23:33:15 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-02 22:33:39 +0000 |
| commit | 20c7876d86392b9e4743b08c93bbb0fc1d41d272 (patch) | |
| tree | a332911bdcba3b0818174c770502da38611f6a1f | |
| parent | ef7069a80e240021dd79e8915ef0b10e6f27473d (diff) | |
| download | PROJ-20c7876d86392b9e4743b08c93bbb0fc1d41d272.tar.gz PROJ-20c7876d86392b9e4743b08c93bbb0fc1d41d272.zip | |
Merge pull request #3000 from rouault/fix_2999
news.rst: add hints about usage changes in PROJ 8.2.0 for Windows users (fixes #2999)
| -rw-r--r-- | docs/docbuild/Dockerfile | 10 | ||||
| -rw-r--r-- | docs/source/news.rst | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/docs/docbuild/Dockerfile b/docs/docbuild/Dockerfile index 74a3d720..f8ba091b 100644 --- a/docs/docbuild/Dockerfile +++ b/docs/docbuild/Dockerfile @@ -19,14 +19,14 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen && \ ENV LANG en_GB.UTF-8 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y curl flex bison && \ - curl -LOs https://doxygen.nl/files/doxygen-1.9.1.src.tar.gz && \ - tar xvzf doxygen-1.9.1.src.tar.gz && \ - rm -rf doxygen-1.9.1.src.tar.gz && \ - cd doxygen-1.9.1 && \ + curl -LOs https://doxygen.nl/files/doxygen-1.9.3.src.tar.gz && \ + tar xvzf doxygen-1.9.3.src.tar.gz && \ + rm -rf doxygen-1.9.3.src.tar.gz && \ + cd doxygen-1.9.3 && \ mkdir build && \ cd build && \ cmake .. -DCMAKE_INSTALL_PREFIX=/usr && \ make -j$(nproc) && \ make install && \ cd ../.. && \ - rm -rf doxygen-1.9.1 + rm -rf doxygen-1.9.3 diff --git a/docs/source/news.rst b/docs/source/news.rst index 2072eed4..c8277f0d 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -56,6 +56,8 @@ any discrepancies discovered between Autotools and CMake builds. Details about the build system unification can be found in :ref:`RFC7`. +Note also that the "CMake: revise handling of symbol export and static builds" +change mentioned below may require changes for users of the library on Windows. Updates ------- @@ -107,6 +109,12 @@ Updates * CMake: revise handling of symbol export and static builds (`#2912 <https://github.com/OSGEO/PROJ/issues/2912>`_) + This requires changes for users of static builds on Windows that do not use CMake + config files. The empty ``PROJ_DLL=`` definition must now be defined when building + against a static build of PROJ. + For users of dynamic builds on Windows, the ``PROJ_MSVC_DLL_IMPORT`` definition is + no longer needed. + Bug fixes --------- |