Commit 33f207ca74f17763d555031e026c9c0490709976

Authored by m-holger
1 parent 6e6a73d2

Add FUTURE build option

CMakeLists.txt
@@ -104,6 +104,8 @@ option(INSTALL_PKGCONFIG "Install pkgconfig file" ON) @@ -104,6 +104,8 @@ option(INSTALL_PKGCONFIG "Install pkgconfig file" ON)
104 option(INSTALL_CMAKE_PACKAGE "Install cmake package files" ON) 104 option(INSTALL_CMAKE_PACKAGE "Install cmake package files" ON)
105 option(INSTALL_EXAMPLES "Install example files" ON) 105 option(INSTALL_EXAMPLES "Install example files" ON)
106 106
  107 +option(FUTURE "Include ABI-breaking changes CONSIDERED for the next major release" OFF)
  108 +
107 # *** END OPTIONS *** 109 # *** END OPTIONS ***
108 110
109 if(NOT (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)) 111 if(NOT (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS))
@@ -121,6 +123,10 @@ else() @@ -121,6 +123,10 @@ else()
121 set(ENABLE_QTC_ARG --disable-tc) 123 set(ENABLE_QTC_ARG --disable-tc)
122 endif() 124 endif()
123 125
  126 +if(FUTURE)
  127 + add_compile_definitions(QPDF_FUTURE=1)
  128 +endif()
  129 +
124 enable_testing() 130 enable_testing()
125 set(RUN_QTEST perl ${qpdf_SOURCE_DIR}/run-qtest ${ENABLE_QTC_ARG}) 131 set(RUN_QTEST perl ${qpdf_SOURCE_DIR}/run-qtest ${ENABLE_QTC_ARG})
126 132
@@ -347,6 +353,7 @@ message(STATUS " build static libraries: ${BUILD_STATIC_LIBS}") @@ -347,6 +353,7 @@ message(STATUS " build static libraries: ${BUILD_STATIC_LIBS}")
347 message(STATUS " build manual: ${BUILD_DOC}") 353 message(STATUS " build manual: ${BUILD_DOC}")
348 message(STATUS " compiler warnings are errors: ${WERROR}") 354 message(STATUS " compiler warnings are errors: ${WERROR}")
349 message(STATUS " QTC test coverage: ${ENABLE_QTC}") 355 message(STATUS " QTC test coverage: ${ENABLE_QTC}")
  356 +message(STATUS " include future changes: ${FUTURE}")
350 message(STATUS " system: ${CPACK_SYSTEM_NAME}") 357 message(STATUS " system: ${CPACK_SYSTEM_NAME}")
351 message(STATUS "") 358 message(STATUS "")
352 message(STATUS "*** Options Summary ***") 359 message(STATUS "*** Options Summary ***")
manual/installation.rst
@@ -277,6 +277,11 @@ BUILD_SHARED_LIBS, BUILD_STATIC_LIBS @@ -277,6 +277,11 @@ BUILD_SHARED_LIBS, BUILD_STATIC_LIBS
277 compiled executables can find the DLL. Updating your path is not 277 compiled executables can find the DLL. Updating your path is not
278 necessary if you build with static libraries only. 278 necessary if you build with static libraries only.
279 279
  280 +FUTURE
  281 + This option enables changes planned for the next major release to be
  282 + included. These changes are ABI breaking and are subject to change. They
  283 + are NOT part of the stable API.
  284 +
280 QTEST_COLOR 285 QTEST_COLOR
281 Turn this on or off to control whether qtest uses color in its 286 Turn this on or off to control whether qtest uses color in its
282 output. 287 output.