Skip to content

Commit c13bc04

Browse files
committed
Fix zmq module include and library path
1 parent 1f191b1 commit c13bc04

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ script:
139139
elif [ "$RESOLVE_DEPS_BY" == "conan" ]; then
140140
cd $HOME/build;
141141
conan install $GRAYBAT_ROOT --build=missing -s compiler=gcc -s compiler.version=6.2 -s compiler.libcxx=libstdc++;
142-
cmake $CMAKE_FLAGS $GRAYBAT_ROOT;
142+
cmake $CMAKE_FLAGS -DCONAN_DISABLE_CHECK_COMPILER=TRUE $GRAYBAT_ROOT;
143143
make check;
144144
make gbZMQSignaling;
145145
./gbZMQSignaling&;

graybatConfig.cmake

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${graybat_DIR}/include/graybat/utils
5353
# - Resolves dependencies of ZMQ
5454
###############################################################################
5555

56-
#TODO: workaround since id is empty on travis build
57-
set(CMAKE_CXX_COMPILER_ID "GNU")
58-
5956
if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
57+
set(CONAN_DISABLE_CHECK_COMPILER "FALSE")
6058
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
6159
conan_basic_setup()
60+
message("${CMAKE_INCLUDE_PATH}")
61+
message("${CMAKE_LIBRARY_PATH}")
62+
#set(graybat_INCLUDE_DIRS ${graybat_INCLUDE_DIRS} ${CONAN_INCLUDE_DIRS})
63+
#set(graybat_LIBRARIES ${graybat_LIBRARIES} ${CONAN_LIB_DIRS})
6264
endif()
6365

6466

@@ -69,6 +71,8 @@ find_package(METIS MODULE 5.1.0)
6971
set(graybat_INCLUDE_DIRS ${graybat_INCLUDE_DIRS} ${METIS_INCLUDE_DIRS})
7072
set(graybat_LIBRARIES ${graybat_LIBRARIES} ${METIS_LIBRARIES})
7173

74+
message("${METIS_INCLUDE_DIRS}")
75+
message("${METIS_LIBRARIES}")
7276

7377
###############################################################################
7478
# ZMQ LIB
@@ -77,6 +81,9 @@ find_package(ZMQ MODULE 4.0.0 REQUIRED)
7781
set(graybat_INCLUDE_DIRS ${graybat_INCLUDE_DIRS} ${ZMQ_INCLUDE_DIRS})
7882
set(graybat_LIBRARIES ${graybat_LIBRARIES} ${ZMQ_LIBRARIES})
7983

84+
message("${ZMQ_INCLUDE_DIRS}")
85+
message("${ZMQ_LIBRARIES}")
86+
8087

8188
###############################################################################
8289
# Boost LIB

include/graybat/utils/cmake/modules/FindZMQ.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ else (ZMQ_LIBRARIES AND ZMQ_INCLUDE_DIRS)
2626
/usr/local/include
2727
/opt/local/include
2828
/sw/include
29-
HINTS "${CMAKE_PREFIX_PATH}/include"
29+
HINTS "${CMAKE_PREFIX_PATH}/include" "${CMAKE_INCLUDE_PATH}"
3030

3131
)
3232

@@ -38,6 +38,7 @@ else (ZMQ_LIBRARIES AND ZMQ_INCLUDE_DIRS)
3838
/usr/local/lib
3939
/opt/local/lib
4040
/sw/lib
41+
HINTS "${CMAKE_LIBRARY_PATH}"
4142
)
4243

4344
set(ZMQ_INCLUDE_DIRS

0 commit comments

Comments
 (0)