aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2022-09-14 13:38:15 +0200
committerJay Berkenbilt <ejb@ql.org>2022-09-14 13:41:13 +0200
commitfaac493a5dcbe913ccc950b92b9f8c1e8492b7ef (patch)
tree980fba10b0cc2157e2f2d0f318aedfe1516a462d
parent5796475a5e0df5d2e30e8351ab6a09dcebbd1585 (diff)
downloadqpdf-faac493a5dcbe913ccc950b92b9f8c1e8492b7ef.tar.zst
Force project includes before system includes (fixes #763)
From time to time, someone has a problem because their build is grabbing an old version of qpdf header files that are installed somewhere on their system. I am hoping this will put an end to that.
-rw-r--r--CMakeLists.txt1
-rw-r--r--ChangeLog6
-rw-r--r--manual/release-notes.rst4
3 files changed, 11 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c4a023f..46fb4367 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,7 @@ if(NOT (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS))
FATAL_ERROR "At least one of static or shared libraries must be built")
endif()
+set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:POINTERHOLDER_TRANSITION=4>)
if(ENABLE_QTC)
diff --git a/ChangeLog b/ChangeLog
index add878fb..8e7680ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-09-14 Jay Berkenbilt <ejb@ql.org>
+
+ * Set CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON in cmake to
+ (hopefully) solve the problem of older installed qpdf headers
+ interfering with building qpdf from source. Fixes #763.
+
2022-09-12 Jay Berkenbilt <ejb@ql.org>
* Add some missing DLL exports that only affect the Windows build.
diff --git a/manual/release-notes.rst b/manual/release-notes.rst
index a543e203..f91c3cec 100644
--- a/manual/release-notes.rst
+++ b/manual/release-notes.rst
@@ -17,6 +17,10 @@ For a detailed list of changes, please see the file
- Some symbols were not properly exported for the Windows DLL
build.
+ - Force project-specific header files to precede all others in the
+ build so that a previous qpdf installation won't break building
+ qpdf from source.
+
- Packaging note omitted from 11.0.0 release notes:
- On GitHub, the release tags are now `vX.Y.Z` instead of