fixes for systec build in cmake

Author: jsouter

CMakeLists.txt

@@ -71,9 +71,13 @@ if (UNIX)
 else()
     target_link_libraries(CanModuleMain PUBLIC
         ${anagate_SOURCE_DIR}/Win64/AnaGateCanDll64.lib
+        ${systec_SOURCE_DIR}/lib/USBCAN64.lib
     )
+    target_include_directories(CanModuleMain PUBLIC ${systec_SOURCE_DIR}/Include)
     file(COPY "${anagate_SOURCE_DIR}/Win64/AnaGateCan64.dll"
          DESTINATION "${CMAKE_BINARY_DIR}/Release")
+    file(COPY "${systec_SOURCE_DIR}/lib/USBCAN64.dll"
+         DESTINATION "${CMAKE_BINARY_DIR}/Release")
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")

cmake/systec.cmake

@@ -1,14 +1,37 @@
-#-----
-#SYSTEC USB-CANmodul Utility Disk
-#-----
-if( NOT DEFINED ENV{SYSTEC_PATH_HEADERS} OR NOT DEFINED ENV{SYSTEC_PATH_LIBS} )
-	message( FATAL_ERROR "unable to determine SYSTEC USB-CANmodule Utility Disk headers and library paths from environment variables SYSTEC_PATH_HEADERS [$ENV{SYSTEC_PATH_HEADERS}] SYSTEC_PATH_LIBS [$ENV{SYSTEC_PATH_LIBS}]")
+include(FetchContent)
+
+if(NOT DEFINED SYSTEC_LIBRARY)
+	message(FATAL_ERROR "Could not find systec library locally")
+    # set(SYTEC_LIBRARY "TODO zip path goes here")
+endif()
+
+set(SYSTEC_FETCHCONTENT_ARGS
+    URL "${SYSTEC_LIBRARY}"
+    DOWNLOAD_EXTRACT_TIMESTAMP True
+)
+
+if(EXISTS "${SYSTEC_LIBRARY}")
+    message(STATUS "Using local Systec archive: ${SYSTEC_LIBRARY}")
+elseif(SYSTEC_LIBRARY MATCHES "^https?://")
+    if(DEFINED ENV{ICS_REPO_DEPS_TOKEN} AND NOT "$ENV{ICS_REPO_DEPS_TOKEN}" STREQUAL "")
+        message(STATUS "Downloading Systec archive with authentication: ${SYSTEC_LIBRARY}")
+        list(APPEND SYSTEC_FETCHCONTENT_ARGS
+            HTTP_HEADER "PRIVATE-TOKEN: $ENV{ICS_REPO_DEPS_TOKEN}"
+        )
+    else()
+        message(STATUS "Downloading Systec archive without authentication: ${SYSTEC_LIBRARY}")
+    endif()
 else()
-	message( STATUS "using SYSTEC USB-CANmodule Utility Disk headers and library paths from environment variables SYSTEC_PATH_HEADERS [$ENV{SYSTEC_PATH_HEADERS}] SYSTEC_PATH_LIBS [$ENV{SYSTEC_PATH_LIBS}]")
+    message(FATAL_ERROR "SYSTEC_LIBRARY must be an existing local archive or an http(s) URL. Got: ${SYSTEC_LIBRARY}")
+endif()
+
+FetchContent_Declare(
+    Systec
+    ${SYSTEC_FETCHCONTENT_ARGS}
+)
+
+FetchContent_MakeAvailable(Systec)
+
+if (WIN32)
+    add_compile_definitions(WIN32)
 endif()
-include_directories($ENV{SYSTEC_PATH_HEADERS})
-set(SYSTEC_LIB_PATH $ENV{SYSTEC_PATH_LIBS})
-if(NOT TARGET libusbcan64)
-	add_library(libusbcan64 SHARED IMPORTED)
-	set_property(TARGET libusbcan64 PROPERTY IMPORTED_LOCATION $ENV{SYSTEC_PATH_LIBS}/USBCAN64.lib)
-endif()