diff options
| author | Dominique Leuenberger <dimstar@opensuse.org> | 2020-11-10 15:47:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 15:47:17 +0100 |
| commit | 3e33513e2cde494ecd14363c3dd3ecb7f9ac1627 (patch) | |
| tree | d20688d0c26da0713527bebcf89dc8533c863e35 | |
| parent | ed7726bbda072bf89cb08fde01a5e30eb1be09cb (diff) | |
| parent | 82aa1b0a7b5dbc8f43ff62aee918e1d252d1d389 (diff) | |
| download | libproxy-git-3e33513e2cde494ecd14363c3dd3ecb7f9ac1627.tar.gz | |
Merge pull request #142 from mcatanzaro/mcatanzaro/libmodman
Never use system libmodman
| -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) |