diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-18 14:05:55 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-18 14:05:55 +0200 |
| commit | 55e7879aecbf903a9bdf9a01a3ce83c6f2a9bafc (patch) | |
| tree | 48b48615fc81b7920000b89fa01d50fe60f8e0cc /cmake | |
| parent | 130bceac9df916ca83767c9c7b4360af9abe5feb (diff) | |
Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/macros/FindZMQ.cmake | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cmake/macros/FindZMQ.cmake b/cmake/macros/FindZMQ.cmake index 6039dd56e2c..6686431b8b7 100644 --- a/cmake/macros/FindZMQ.cmake +++ b/cmake/macros/FindZMQ.cmake @@ -20,16 +20,18 @@ else() ) endif() -find_path(ZMQ_INCLUDE_DIR +find_path(ZMQ_ROOT_DIR NAMES - zmq.h + include/zmq.h HINTS - "${ZMQ_REGISTRY_PATH}/include" + "${ZMQ_REGISTRY_PATH}" PATHS - /usr/include - /usr/local/include + /usr + /usr/local ) +find_path(ZMQ_INCLUDE_DIR zmq.h ${ZMQ_ROOT_DIR}/include) + if (MSVC) # Read registry key holding version if (PLATFORM EQUAL 64) @@ -55,12 +57,11 @@ find_library(ZMQ_LIBRARY NAMES zmq ${ZMQ_LIBRARY_NAME} - HINTS - "${ZMQ_REGISTRY_PATH}/lib" PATHS /lib /usr/lib /usr/local/lib + "${ZMQ_ROOT_DIR}/lib" ) if (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARY) @@ -72,4 +73,4 @@ else() endif() # show the ZMQ_INCLUDE_DIR and ZMQ_LIBRARY variables only in the advanced view -mark_as_advanced(ZMQ_INCLUDE_DIR ZMQ_LIBRARY ZMQ_FOUND) +mark_as_advanced(ZMQ_ROOT_DIR ZMQ_INCLUDE_DIR ZMQ_LIBRARY ZMQ_FOUND) |