diff --git a/cmake/Modules/FindDOOCS.cmake b/cmake/Modules/FindDOOCS.cmake index e38c25f68a9368b9c03006a63fbc33b82fd26015..9fc5ecfc01e9a31e7bd4b8a41d24c0f844363820 100644 --- a/cmake/Modules/FindDOOCS.cmake +++ b/cmake/Modules/FindDOOCS.cmake @@ -32,28 +32,28 @@ SET(DOOCS_FOUND 0) -FIND_PATH(DOOCS_DIR libDOOCSapi.so - ${CMAKE_CURRENT_LIST_DIR} - /export/doocs/lib -) -set(DOOCS_LIBRARIES DOOCSapi nsl dl pthread m rt ldap) - -if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";server;") - FIND_PATH(DOOCS_DIR_SERVER libEqServer.so +if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";zmq;") + FIND_PATH(DOOCS_DIR_ZMQ libDOOCSdzmq.so ${CMAKE_CURRENT_LIST_DIR} /export/doocs/lib ) - set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} EqServer) + set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} DOOCSdzmq) endif() -if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";zmq;") - FIND_PATH(DOOCS_DIR_ZMQ libDOOCSdzmq.so +if (";${DOOCS_FIND_COMPONENTS};" MATCHES ";server;") + FIND_PATH(DOOCS_DIR_SERVER libEqServer.so ${CMAKE_CURRENT_LIST_DIR} /export/doocs/lib ) - set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} DOOCSdzmq) + set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} EqServer) endif() +FIND_PATH(DOOCS_DIR libDOOCSapi.so + ${CMAKE_CURRENT_LIST_DIR} + /export/doocs/lib +) +set(DOOCS_LIBRARIES ${DOOCS_LIBRARIES} DOOCSapi nsl dl pthread m rt ldap) + # now set the required variables based on the determined DOOCS_DIR set(DOOCS_INCLUDE_DIRS ${DOOCS_DIR}/include) set(DOOCS_LIBRARY_DIRS ${DOOCS_DIR}/)