Commit faac493a5dcbe913ccc950b92b9f8c1e8492b7ef

Authored by Jay Berkenbilt
1 parent 5796475a

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.
CMakeLists.txt
@@ -111,6 +111,7 @@ if(NOT (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)) @@ -111,6 +111,7 @@ if(NOT (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS))
111 FATAL_ERROR "At least one of static or shared libraries must be built") 111 FATAL_ERROR "At least one of static or shared libraries must be built")
112 endif() 112 endif()
113 113
  114 +set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
114 add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:POINTERHOLDER_TRANSITION=4>) 115 add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:POINTERHOLDER_TRANSITION=4>)
115 116
116 if(ENABLE_QTC) 117 if(ENABLE_QTC)
ChangeLog
  1 +2022-09-14 Jay Berkenbilt <ejb@ql.org>
  2 +
  3 + * Set CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON in cmake to
  4 + (hopefully) solve the problem of older installed qpdf headers
  5 + interfering with building qpdf from source. Fixes #763.
  6 +
1 2022-09-12 Jay Berkenbilt <ejb@ql.org> 7 2022-09-12 Jay Berkenbilt <ejb@ql.org>
2 8
3 * Add some missing DLL exports that only affect the Windows build. 9 * Add some missing DLL exports that only affect the Windows build.
manual/release-notes.rst
@@ -17,6 +17,10 @@ For a detailed list of changes, please see the file @@ -17,6 +17,10 @@ For a detailed list of changes, please see the file
17 - Some symbols were not properly exported for the Windows DLL 17 - Some symbols were not properly exported for the Windows DLL
18 build. 18 build.
19 19
  20 + - Force project-specific header files to precede all others in the
  21 + build so that a previous qpdf installation won't break building
  22 + qpdf from source.
  23 +
20 - Packaging note omitted from 11.0.0 release notes: 24 - Packaging note omitted from 11.0.0 release notes:
21 25
22 - On GitHub, the release tags are now `vX.Y.Z` instead of 26 - On GitHub, the release tags are now `vX.Y.Z` instead of