Skip to content

prefix cmake options #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andiwand merged 2 commits into from
Mar 27, 2026
Merged

prefix cmake options #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c47818f
prefix cmake options
andiwand Mar 27, 2026
275cc75
fix
andiwand Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
15 changes: 9 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down