diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 5b6953c0..79cf7379 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -93,8 +93,9 @@ jobs: -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=install -DODR_TEST=ON - -DWITH_PDF2HTMLEX=ON - -DWITH_WVWARE=ON + -DODR_WITH_PDF2HTMLEX=ON + -DODR_WITH_WVWARE=ON + -DODR_WITH_LIBMAGIC=ON - name: cmake if: runner.os == 'Windows' @@ -105,8 +106,9 @@ jobs: -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DODR_TEST=ON - -DWITH_PDF2HTMLEX=OFF - -DWITH_WVWARE=OFF + -DODR_WITH_PDF2HTMLEX=OFF + -DODR_WITH_WVWARE=OFF + -DODR_WITH_LIBMAGIC=OFF - name: build run: cmake --build build --config Release diff --git a/CMakeLists.txt b/CMakeLists.txt index bf466c6b..84f85c40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,12 @@ option(BUILD_SHARED_LIBS "Build using shared libraries" ON) option(ODR_TEST "enable tests" OFF) option(ODR_CLI "enable command line interface" ON) option(ODR_CLANG_TIDY "Run clang-tidy static analysis" OFF) -option(WITH_PDF2HTMLEX "Build with pdf2htmlEX" ON) -option(WITH_WVWARE "Build with wvWare" ON) -option(WITH_LIBMAGIC "Build with libmagic" ON) +option(WITH_PDF2HTMLEX "Deprecated: `ODR_WITH_PDF2HTMLEX` instead! Build with pdf2htmlEX" ON) +option(WITH_WVWARE "Deprecated: `ODR_WITH_WVWARE` instead! Build with wvWare" ON) +option(WITH_LIBMAGIC "Deprecated: `ODR_WITH_WVWARE` instead! Build with libmagic" ON) +option(ODR_WITH_PDF2HTMLEX "Build with pdf2htmlEX" "${WITH_PDF2HTMLEX}") +option(ODR_WITH_WVWARE "Build with wvWare" "${WITH_WVWARE}") +option(ODR_WITH_LIBMAGIC "Build with libmagic" "${WITH_LIBMAGIC}") option(ODR_BUNDLE_ASSETS "Bundle assets during build and install" ON) include(GNUInstallDirs) @@ -216,7 +219,7 @@ set(ODR_BUILD_ODR_DATA_PATH "${CMAKE_CURRENT_BINARY_DIR}/data") file(COPY "${odr.js_SOURCE_DIR}/" DESTINATION "${ODR_BUILD_ODR_DATA_PATH}") set(ODR_INSTALL_ODR_DATA_PATH "${CMAKE_INSTALL_DATADIR}") -if (WITH_PDF2HTMLEX) +if (ODR_WITH_PDF2HTMLEX) find_package(pdf2htmlEX REQUIRED) find_package(poppler REQUIRED) target_sources(odr @@ -256,7 +259,7 @@ if (WITH_PDF2HTMLEX) set(ODR_INSTALL_PDF2HTMLEX_DATA_PATH "${PDF2HTMLEX_DATA_PATH}") endif () endif () -if (WITH_WVWARE) +if (ODR_WITH_WVWARE) find_package(wvware REQUIRED) target_sources(odr PRIVATE @@ -272,7 +275,7 @@ if (WITH_WVWARE) ODR_WITH_WVWARE ) endif () -if (WITH_LIBMAGIC) +if (ODR_WITH_LIBMAGIC) find_package(libmagic REQUIRED) target_sources(odr PRIVATE diff --git a/conanfile.py b/conanfile.py index 04d7e101..32705106 100644 --- a/conanfile.py +++ b/conanfile.py @@ -70,9 +70,9 @@ def generate(self): tc = CMakeToolchain(self) tc.variables["CMAKE_PROJECT_VERSION"] = self.version tc.variables["ODR_TEST"] = False - tc.variables["WITH_PDF2HTMLEX"] = self.options.get_safe("with_pdf2htmlEX", False) - tc.variables["WITH_WVWARE"] = self.options.get_safe("with_wvWare", False) - tc.variables["WITH_LIBMAGIC"] = self.options.get_safe("with_libmagic", False) + tc.variables["ODR_WITH_PDF2HTMLEX"] = self.options.get_safe("with_pdf2htmlEX", False) + tc.variables["ODR_WITH_WVWARE"] = self.options.get_safe("with_wvWare", False) + tc.variables["ODR_WITH_LIBMAGIC"] = self.options.get_safe("with_libmagic", False) # Get runenv info, exported by package_info() of dependencies # We need to obtain PDF2HTMLEX_DATA_DIR, POPPLER_DATA_DIR, FONTCONFIG_PATH and WVDATADIR