From 56373d9ab7c139630177cc362079e03c6aaf38e5 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 20 Sep 2016 18:48:25 +0200
Subject: [PATCH] look for the other DOOCS components in the same directory as
the client
---
cmake/Modules/FindDOOCS.cmake | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/cmake/Modules/FindDOOCS.cmake b/cmake/Modules/FindDOOCS.cmake
index 9a7a592..308f442 100644
--- a/cmake/Modules/FindDOOCS.cmake
+++ b/cmake/Modules/FindDOOCS.cmake
@@ -32,23 +32,21 @@
SET(DOOCS_FOUND 0)
+
FIND_PATH(DOOCS_DIR libDOOCSapi.so
${CMAKE_CURRENT_LIST_DIR}
/export/doocs/lib
)
-
if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";zmq;")
FIND_PATH(DOOCS_DIR_ZMQ libDOOCSdzmq.so
- ${CMAKE_CURRENT_LIST_DIR}
- /export/doocs/lib
+ ${DOOCS_DIR}
)
set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} DOOCSdzmq)
endif()
if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";server;")
FIND_PATH(DOOCS_DIR_SERVER libEqServer.so
- ${CMAKE_CURRENT_LIST_DIR}
- /export/doocs/lib
+ ${DOOCS_DIR}
)
set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} EqServer)
endif()
--
GitLab