Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 452dfa9..e30c3cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -206,13 +206,15 @@ endif() add_definitions(-DSTBI_FAILURE_USERMSG) ## mpc - Micro Parser Combinators ## -execute_process( - COMMAND git submodule update --init src/mpc - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -) - -add_library(mpc STATIC "mpc/mpc.c") - +pkg_check_modules(MPC QUIET mpc) +if(NOT MPC_FOUND) + execute_process( + COMMAND git submodule update --init src/mpc + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + ) + add_library(mpc STATIC "mpc/mpc.c") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc) +endif() ## OpenBoardView ## add_subdirectory(openboardview) diff --git a/src/openboardview/FileFormats/GenCADFile.h b/src/openboardview/FileFormats/GenCADFile.h index 1ccf8df..c57f7ff 100644 --- a/src/openboardview/FileFormats/GenCADFile.h +++ b/src/openboardview/FileFormats/GenCADFile.h @@ -5,7 +5,7 @@ #include "build-generated/GenCADFileGrammar.h" -#include "mpc/mpc.h" +#include "mpc.h" #include #include '/guix/log/gnu/packages/pretty-print.scm'>logtreecommitdiff
path: root/gnu/packages/pretty-print.scm
AgeCommit message (Expand)Author
2020-03-07gnu: fmt: Switch back to url-fetch....* gnu/packages/pretty-print.scm (fmt)[source]: Use url-fetch instead of git-fetch since upstream uploads releases. Both approaches produce the same package, but git-fetch requires more bandwidth. Pierre Neidhardt
2020-03-06gnu: fmt: Fix home page....* gnu/packages/pretty-print.scm (fmt)[home-page]: Update. Tobias Geerinckx-Rice
2020-03-06gnu: fmt: Update to 6.1.2....* gnu/packages/pretty-print.scm (fmt): Update to 6.1.2. Pierre Neidhardt
2020-03-06gnu: fmt: Use HTTPS and git-fetch....* gnu/packages/pretty-print.scm (fmt)[source]: Use git-fetch. [home-page]: Use HTTPS. Pierre Neidhardt
2020-02-21gnu: highlight: Build perl bindings....* gnu/packages/pretty-print.scm (highlight)[native-inputs]: Add swig. [inputs]: Add perl. [arguments]: Specify lua version for pkg-config command, add 'install-perl-bindings' phase. Paul Garlick
2020-01-14gnu: source-highlight: Update to 3.1.9....* gnu/packages/pretty-print.scm (source-highlight): Update to 3.1.9. Marius Bakke
2019-12-11gnu: Remove fmt-restinio....This is a follow-up to commit 71ce0b52901e49002502d220551dad21c07a7fed. * gnu/packages/pretty-print.scm (fmt-restinio): Remove variable. Marius Bakke
2019-12-11gnu: fmt: Build shared library instead of static....* gnu/packages/pretty-print.scm (fmt)[arguments]: New field. * gnu/packages/networking.scm (fmt-restinio): Remove variable. (restinio)[propagated-inputs]: Change from FMT-RESTINIO to FMT. (opendht)[inputs]: Likewise. Marius Bakke
2019-11-12gnu: highlight: Update to 3.54....* gnu/packages/pretty-print.scm (highlight): Update to 3.54. Tobias Geerinckx-Rice
2019-09-24gnu: fmt: Update to 6.0.0....* gnu/packages/pretty-print.scm (fmt): Update to 6.0.0. Marius Bakke