diff --git a/cmake/Modules/FindDOOCS.cmake b/cmake/Modules/FindDOOCS.cmake index 6a4e9bbb58038c9f5f63b2e36194daac9304f637..42d9f9c660c02f55a3bd04415755df414e8334b5 100644 --- a/cmake/Modules/FindDOOCS.cmake +++ b/cmake/Modules/FindDOOCS.cmake @@ -69,15 +69,24 @@ endforeach() set(DOOCS_FIND_COMPONENTS ${DOOCS_FIND_COMPONENTS_TRANSFORMED}) include(FindPkgConfig) + +if(DEFINED DOOCS_DIR) + set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:${DOOCS_DIR}/pkgconfig) +endif() +set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:/export/doocs/lib/pkgconfig) +message("Using PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH}") pkg_check_modules(DOOCS REQUIRED ${DOOCS_FIND_COMPONENTS}) string(REPLACE ";" " " DOOCS_CFLAGS "${DOOCS_CFLAGS}") string(REPLACE ";" " " DOOCS_LDFLAGS "${DOOCS_LDFLAGS}") +# thread libraries are required by DOOCS but seem not to be added through pkgconfig... +find_package(Threads REQUIRED) + set(DOOCS_DIR "${DOOCS_doocs-doocsapi_LIBDIR}") set(DOOCS_VERSION "${DOOCS_doocs-doocsapi_VERSION}") set(DOOCS_CXX_FLAGS ${DOOCS_CFLAGS}) -set(DOOCS_LIBRARIES ${DOOCS_LDFLAGS}) +set(DOOCS_LIBRARIES ${DOOCS_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT}) set(DOOCS_LINKER_FLAGS "-Wl,--no-as-needed") set(DOOCS_LINK_FLAGS ${DOOCS_LINKER_FLAGS})