diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-11 08:22:30 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-24 16:45:51 -0500 |
| commit | 82aa1b0a7b5dbc8f43ff62aee918e1d252d1d389 (patch) | |
| tree | 9bfebbe480c5f01c04471d7676f9ba22392e4f19 | |
| parent | cd619d3e9d683237f6317f979d5c6a7290d7e429 (diff) | |
| download | libproxy-git-82aa1b0a7b5dbc8f43ff62aee918e1d252d1d389.tar.gz | |
Never use system libmodman
I was very surprised to discover that libmodman is a system library.
It's packaged separately from libproxy in distros (I checked Fedora and
openSUSE), and libproxy's build system does not install its files, but
libproxy nonetheless appears to be the only upstream. Distros build the
system library from a decade-old tarball.
Anyway, nothing besides libproxy uses it, so the system package should
probably be retired. By using our own internal libmodman, we can make
API and ABI changes to modernize libmodman and improve its safety,
without having to worry about other consumers (which don't exist,
anyway).
Fixes #140
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f26a7c..4f51e38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,24 +33,9 @@ include(cmake/paths.cmk) option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) ### Subdirectories -# Conditionally build bundled libmodman -option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF) -find_package(libmodman QUIET) -if(LIBMODMAN_FOUND) - if("${LIBMODMAN_VERSION_MAJOR}" STREQUAL "2") - message(STATUS "Building with system libmodman") - else() - message(FATAL_ERROR "Found incompatible libmodman on your system (libmodman 2.X is needed)") - endif() -else() - if(FORCE_SYSTEM_LIBMODMAN) - message(FATAL_ERROR "Libmodman could not be found on your system") - else() - message(STATUS "Building with bundled libmodman") - add_subdirectory(libmodman) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - endif() -endif() + +add_subdirectory(libmodman) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # Conditionally build bindings if(NOT WIN32) |