| 1 | Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281
|
| 2 |
|
| 3 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
| 4 | index 452dfa9..e30c3cf 100644
|
| 5 | |
| 6 | |
| 7 | @@ -206,13 +206,15 @@ endif()
|
| 8 | add_definitions(-DSTBI_FAILURE_USERMSG)
|
| 9 |
|
| 10 | ## mpc - Micro Parser Combinators ##
|
| 11 | -execute_process(
|
| 12 | - COMMAND git submodule update --init src/mpc
|
| 13 | - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
|
| 14 | -)
|
| 15 | -
|
| 16 | -add_library(mpc STATIC "mpc/mpc.c")
|
| 17 | -
|
| 18 | +pkg_check_modules(MPC QUIET mpc)
|
| 19 | +if(NOT MPC_FOUND)
|
| 20 | + execute_process(
|
| 21 | + COMMAND git submodule update --init src/mpc
|
| 22 | + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
|
| 23 | + )
|
| 24 | + add_library(mpc STATIC "mpc/mpc.c")
|
| 25 | + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc)
|
| 26 | +endif()
|
| 27 |
|
| 28 | ## OpenBoardView ##
|
| 29 | add_subdirectory(openboardview)
|
| 30 | diff --git a/src/openboardview/FileFormats/GenCADFile.h b/src/openboardview/FileFormats/GenCADFile.h
|
| 31 | index 1ccf8df..c57f7ff 100644
|
| 32 | |
| 33 | |
| 34 | @@ -5,7 +5,7 @@
|
| 35 |
|
| 36 | #include "build-generated/GenCADFileGrammar.h"
|
| 37 |
|
| 38 | -#include "mpc/mpc.h"
|
| 39 | +#include "mpc.h"
|
| 40 |
|
| 41 | #include <map>
|
| 42 | #include <string>
|