From 10cc95cec187eabbc2c4ae7049fd559c86f4caa3 Mon Sep 17 00:00:00 2001 From: jcasals <jcasals@iri.upc.edu> Date: Tue, 5 Nov 2019 14:36:25 +0100 Subject: [PATCH] Fixed CMake issues regarding CSM --- cmake_modules/Findcsm.cmake | 4 ++-- src/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake_modules/Findcsm.cmake b/cmake_modules/Findcsm.cmake index 938022e..7ad6ce1 100644 --- a/cmake_modules/Findcsm.cmake +++ b/cmake_modules/Findcsm.cmake @@ -46,8 +46,8 @@ macro(csm_report_not_found REASON_MSG) # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by # FindPackage() use the camelcase library name, not uppercase. if (csm_FIND_QUIETLY) - message(STATUS "Failed to find csm- " ${REASON_MSG} ${ARGN}) - else (csm_FIND_REQUIRED) + message(STATUS "Ignoring csm dependency - " ${REASON_MSG} ${ARGN}) + elseif(csm_FIND_REQUIRED) message(FATAL_ERROR "Failed to find csm - " ${REASON_MSG} ${ARGN}) else() # Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee3f8e7..52c93b5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,7 +73,9 @@ SET(SRCS ENDIF(csm_FOUND) # create the shared library ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -target_link_libraries(${PROJECT_NAME} ${csm_LIBRARY}) +IF(csm_FOUND) + target_link_libraries(${PROJECT_NAME} ${csm_LIBRARY}) +ENDIF(csm_FOUND) #install library INSTALL(TARGETS ${PROJECT_NAME} -- GitLab