From 94d7471aec9e676944242b44a84f9fe2d3f2b0c6 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Mon, 1 Jul 2019 16:53:06 +0300 Subject: [PATCH] - attempt to fix CI --- .gitlab-ci.yml | 2 +- src/libs/resiprocate/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df86c42d..d4142343 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,6 @@ build_exe: - mkdir -p build - cd build - git clone https://gitlab.com/dmytro.bogovych/libraries.git - - cmake -D PLATFORM_LIBS=libraries ../src + - cmake -D LIB_PLATFORM=libraries ../src - cmake --build . \ No newline at end of file diff --git a/src/libs/resiprocate/CMakeLists.txt b/src/libs/resiprocate/CMakeLists.txt index 956dcde1..05bac91c 100644 --- a/src/libs/resiprocate/CMakeLists.txt +++ b/src/libs/resiprocate/CMakeLists.txt @@ -1,5 +1,9 @@ project (resiprocate) +if (NOT OPENSSL_INCLUDE) + message(FATAL_ERROR "OPENSSL_INCLUDE has to be directory with OpenSSL 1.0.x include files.") +endif() + # Rely on C++ 11 set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD_REQUIRED ON) @@ -311,7 +315,7 @@ add_library(resiprocate ${ARES_SOURCES} ${RUTIL_SOURCES} ${STACK_SOURCES} ${DUM_ target_include_directories(resiprocate PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/contrib/ares - /usr/local/include + ${OPENSSL_INCLUDE} ) target_compile_definitions(resiprocate PUBLIC -DUSE_ARES -DUSE_SSL) #add_library(resiprocate_lite ${RUTIL_SOURCES} ${STACK_SOURCES})