From 38a97ae2040e614435764be444e00e3dddd7760d Mon Sep 17 00:00:00 2001 From: Michael Ludwig Date: Tue, 19 Nov 2019 10:32:53 +0100 Subject: [PATCH] fixing OPCUA-1602 bug in build chain: EQUAL becomes STREQUAL and policy set --- CanInterfaceImplementations/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CanInterfaceImplementations/CMakeLists.txt b/CanInterfaceImplementations/CMakeLists.txt index 3d688022..61b6becb 100644 --- a/CanInterfaceImplementations/CMakeLists.txt +++ b/CanInterfaceImplementations/CMakeLists.txt @@ -21,6 +21,7 @@ # cmake_minimum_required(VERSION 3.0) project( CanInterfaceImplementations LANGUAGES C CXX ) +cmake_policy(SET CMP0054 NEW) # we have a mock up build without any vendor libs as well, for CI where we don't want to distribute vendors message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] building vendors [CANMODULE_BUILD_VENDORS:${CANMODULE_BUILD_VENDORS}]") @@ -41,32 +42,31 @@ IF( NOT DEFINED CANMODULE_BUILD_PEAK ) SET(CANMODULE_BUILD_PEAK "ON") ENDIF() -message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] build any vendors [CANMODULE_BUILD_VENDORS:${CANMODULE_BUILD_VENDORS}]") message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] build systec [CANMODULE_BUILD_SYSTEC:${CANMODULE_BUILD_SYSTEC}]") message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] build anagate [CANMODULE_BUILD_ANAGATE:${CANMODULE_BUILD_ANAGATE}]") message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] build peak [CANMODULE_BUILD_PEAK:${CANMODULE_BUILD_PEAK}]") IF (WIN32) - IF( CANMODULE_BUILD_VENDORS EQUAL "ON" ) - IF( CANMODULE_BUILD_SYSTEC EQUAL "ON" ) + IF( CANMODULE_BUILD_VENDORS STREQUAL "ON" ) + IF( CANMODULE_BUILD_SYSTEC STREQUAL "ON" ) add_subdirectory(systec) message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] building vendor systec for windows") ENDIF() - IF( CANMODULE_BUILD_ANAGATE EQUAL "ON" ) + IF( CANMODULE_BUILD_ANAGATE STREQUAL "ON" ) add_subdirectory(anagate) message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] building vendor anagate for windows") ENDIF() - IF( CANMODULE_BUILD_PEAK EQUAL "ON" ) + IF( CANMODULE_BUILD_PEAK STREQUAL "ON" ) add_subdirectory(pkcan) message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] building vendor peak for windows") ENDIF() ENDIF() ELSE() - IF( CANMODULE_BUILD_VENDORS EQUAL "ON" ) - IF( CANMODULE_BUILD_SYSTEC EQUAL "ON" OR CANMODULE_BUILD_PEAK EQUAL "ON" ) + IF( CANMODULE_BUILD_VENDORS STREQUAL "ON" ) + IF( CANMODULE_BUILD_SYSTEC STREQUAL "ON" OR CANMODULE_BUILD_PEAK STREQUAL "ON" ) add_subdirectory(sockcan) # systec, peak message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] building socketcan for vendors systec, peak for linux") ENDIF() - IF( CANMODULE_BUILD_ANAGATE EQUAL "ON" ) + IF( CANMODULE_BUILD_ANAGATE STREQUAL "ON" ) add_subdirectory(anagate) message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}] building vendor anagate for linux") ENDIF()