Commit f967849f authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'update_find_remus'

0905a91d

 Allow smtk to find newer and older versions of Remus.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !22
parents 96a208da 0905a91d
......@@ -17,11 +17,13 @@
# REMUS_INCLUDE_DIRS The location of Remus headers
find_path(REMUS_ROOT_DIR
NAMES include/remus/Version.h
NAMES include/remus/version.h
include/remus/Version.h
)
find_path(REMUS_INCLUDE_DIR
NAMES remus/version.h
remus/Version.h
HINTS ${REMUS_ROOT_DIR}/include/
)
......@@ -35,10 +37,6 @@ if(REMUS_FOUND)
#now we create the import targets to be used
include(${REMUS_ROOT_DIR}/lib/Remus-targets.cmake)
#find boost since it could be in a location that isn't part of our
#include paths
#cmb_find_boost()
#next find ZeroMQ since it could be in a location that isn't part of our
#include paths
find_package(ZeroMQ REQUIRED)
......@@ -46,6 +44,7 @@ if(REMUS_FOUND)
include_directories(SYSTEM
${Boost_INCLUDE_DIRS}
${ZeroMQ_INCLUDE_DIRS})
endif()
set(REMUS_INCLUDE_DIRS ${REMUS_INCLUDE_DIR})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment