- more changes for CI

.gitlab-ci.yml

@@ -2,6 +2,7 @@ build_exe:
     script:
         - mkdir -p build
         - cd build
-        - cmake ../src
+        - git clone git@gitlab.com:dmytro.bogovych/libraries.git
+        - cmake -D PLATFORM_LIBS=libraries ../src
         - cmake --build .
         

src/CMakeLists.txt

@@ -59,28 +59,48 @@ set (rtphone_engine engine)
 
 set (USE_AMR_CODEC OFF CACHE BOOL "Use AMR codec. Requires libraries.")
 set (USE_EVS_CODEC OFF CACHE BOOL "Use EVS codec.")
-set (OPENSSL_SSL ssl CACHE STRING "Pointer to ssl library")
-set (OPENSSL_CRYPTO crypto CACHE STRING "Pointer to crypto library")
-set (OPENSSL_INCLUDE "/usr/local/include/openssl" CACHE STRING "Pointer to OpenSSL include files")
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+if (NOT PLATFORM_LIBS)
-
+    message(FATAL_ERROR "PLATFORM_LIBS must be defined before build! This project requires it to get access to OpenSSL 1.0.x headers")
-message ("Using ssl library at ${OPENSSL_SSL}")
+endif()
-message ("Using crypto library at ${OPENSSL_CRYPTO}")
-message ("Using OpenSSL include files from ${OPENSSL_INCLUDE}")
 
 if (CMAKE_SYSTEM MATCHES "Windows*")
+    set (TARGET_WIN ON)
     add_definitions(-DTARGET_WIN)
+    find_library(SSL_LIB ssl PATHES ${PLATFORM_LIBRARIES}/openssl/lib/win64)
 endif()
 
 if (CMAKE_SYSTEM MATCHES "Linux*")
+    set (TARGET_LINUX ON)
     add_definitions(-DTARGET_LINUX)
+
+    find_library(SSL_LIB
+        NAMES ssl
+        PATHS ${PLATFORM_LIBS}/openssl/1.0/lin64
+        NO_DEFAULT_PATH)
+
+    find_library(CRYPTO_LIB
+        NAMES crypto
+        PATHS ${PLATFORM_LIBS}/openssl/1.0/lin64
+        NO_DEFAULT_PATH)
 endif()
 
 if (CMAKE_SYSTEM MATCHES "Darwin*")
+    set (TARGET_OSX ON)
     add_definitions(-DTARGET_OSX)
+    find_library(SSL_LIB    NAMES ssl    PATHS ${PLATFORM_LIBS}/openssl/lib/osx NO_DEFAULT_PATH)
+    find_library(CRYPTO_LIB NAMES crypto PATHS ${PLATFORM_LIBS}/openssl/1.0/osx NO_DEFAULT_PATH)
 endif()
 
+message(STATUS "SSL library: ${SSL_LIB}")
+message(STATUS "Crypto library: ${CRYPTO_LIB}")
+
+set (OPENSSL_INCLUDE "${PLATFORM_LIBS}/openssl/1.0/include")
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+message (STATUS "OpenSSL include files from ${OPENSSL_INCLUDE}")
+
 set (RTPHONE_SOURCES
     ${rtphone_engine}/media/MT_Statistics.cpp
     ${rtphone_engine}/media/MT_WebRtc.cpp