Skip to content
Snippets Groups Projects
Commit faaddd69 authored by Jens Georg's avatar Jens Georg
Browse files

Manually merge of FindDOOCS from project template

The automatic merge got massively confused
parent adcbe303
No related branches found
No related tags found
No related merge requests found
......@@ -73,10 +73,6 @@ 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})
set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:/export/doocs/lib/pkgconfig)
message("Using PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH}")
......@@ -92,9 +88,6 @@ if(tinemt_FOUND)
else()
find_library(TINEMTLIB tinemt REQUIRED)
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})
pkg_check_modules(DOOCS REQUIRED ${DOOCS_FIND_COMPONENTS})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment