Skip to content

Commit

Permalink
fixing OPCUA-1602 bug in build chain: EQUAL becomes STREQUAL and poli…
Browse files Browse the repository at this point in the history
…cy set
  • Loading branch information
meeludwig committed Nov 19, 2019
1 parent 4aa41ec commit 38a97ae
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions CanInterfaceImplementations/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}]")
Expand All @@ -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()
Expand Down

0 comments on commit 38a97ae

Please sign in to comment.