[#28] Fixed cpprest usage for Linux in CI/CD

Signed-off-by: Clovis Durand <cd.clovel19@gmail.com>
Clovel · Apr 5, 2020 · 3b7c863 · 3b7c863
1 parent b5361a4
commit 3b7c863
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
@@ -77,7 +77,10 @@ if(OPENSSL_FOUND)
         message(STATUS "OpenSSL Version: ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIR} ${OPENSSL_LIBRARIES}")
     endif(APPLE)
 endif(OPENSSL_FOUND)
-find_package(cpprestsdk REQUIRED)
+if(UNIX AND NOT APPLE)
+    set(cpprestsdk_DIR /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/)
+endif(UNIX AND NOT APPLE)
+find_package(cpprestsdk REQUIRED NAMES cpprestsdk cpprest)
 
 #------------------------------------------------------------------------------
 # pkg-config dependencies

diff --git a/generator/src/rest/src/CMakeLists.txt b/generator/src/rest/src/CMakeLists.txt
@@ -35,7 +35,7 @@ list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
 add_library(cpprest-api SHARED
     ${SOURCES}
 )
-target_link_libraries(cpprest-api
+target_link_libraries(cpprest-api PRIVATE
     cpprestsdk::cpprest
 )
 set_target_properties(cpprest-api PROPERTIES
@@ -48,10 +48,12 @@ add_executable(cpprest-api-test
 add_dependencies(cpprest-api-test
     cpprest-api
 )
-target_link_libraries(cpprest-api-test
-    cpprestsdk::cpprest
+target_link_libraries(cpprest-api-test PUBLIC
     cpprest-api
 )
+target_link_libraries(cpprest-api-test PRIVATE
+    cpprestsdk::cpprest
+)
 
 #----------------------------------------------------------------------------
 # The installation is prepended by the CMAKE_INSTALL_PREFIX variable