diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/FindProtobufC.cmake | 2 | ||||
| -rw-r--r-- | src/irmd/CMakeLists.txt | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cfb0c0fa..e3c7976c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,8 @@ if (NOT (PROTOBUF_C_INCLUDE_DIRS AND PROTOBUF_C_LIBRARY AND PROTOBUF_PROTOC_C_EXECUTABLE)) message(FATAL_ERROR "Protobuf C compiler required but not found. " "Please install Google Protocol Buffers.") +else () + message(STATUS "Found protobuf C compiler in ${PROTOBUF_PROTOC_C_EXECUTABLE}") endif () include_directories(${PROTOBUF_C_INCLUDE_DIRS}) diff --git a/cmake/FindProtobufC.cmake b/cmake/FindProtobufC.cmake index ff532a46..ff892b5b 100644 --- a/cmake/FindProtobufC.cmake +++ b/cmake/FindProtobufC.cmake @@ -62,7 +62,7 @@ mark_as_advanced(PROTOBUF_C_INCLUDE_DIR) # Find the protoc-c Executable find_program(PROTOBUF_PROTOC_C_EXECUTABLE - NAMES protoc-c + NAMES protoc protoc-c DOC "The Google Protocol Buffers C Compiler" ) mark_as_advanced(PROTOBUF_PROTOC_C_EXECUTABLE) diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt index c9c2e553..c7e4cbd9 100644 --- a/src/irmd/CMakeLists.txt +++ b/src/irmd/CMakeLists.txt @@ -24,6 +24,7 @@ if (LIBTOML_LIBRARIES) DESTINATION "${OUROBOROS_CONFIG_DIR}") unset(INSTALL_DIR) mark_as_advanced(LIBTOML_LIBRARIES) + find_path(LIBTOML_INCLUDE toml.h) else () message(STATUS "Configuration file support disabled by user") unset(OUROBOROS_CONFIG_FILE CACHE) @@ -83,6 +84,10 @@ add_executable (irmd ${SOURCE_FILES}) target_link_libraries (irmd LINK_PUBLIC ouroboros-common ${LIBTOML_LIBRARIES}) +if (HAVE_TOML) + target_include_directories(irmd PUBLIC ${LIBTOML_INCLUDE}) +endif () + include(AddCompileFlags) if (CMAKE_BUILD_TYPE MATCHES "Debug*") add_compile_flags(irmd -DCONFIG_OUROBOROS_DEBUG) |