From 1cc1f8570dfb3190c24c945a8f913387fa0aef8d Mon Sep 17 00:00:00 2001 From: xzhaoybk Date: Thu, 4 Mar 2021 18:54:02 +0800 Subject: [PATCH] [571679] with visual studio build tools 2019, do not need to specify atls.lib (atlsd.lib) and headers in CMakeLists.txt See "https://docs.microsoft.com/en-us/cpp/porting/visual-cpp-change-history-2003-2015?redirectedfrom=MSDN&view=msvc-160#mfc-and-atl" for atls library change. The webpages of 4diac for opc DA compilation are updated as well. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=571679 Change-Id: I72364a2fae1e870b744fc5c4dc7d739622834aa8 Signed-off-by: xzhaoybk --- src/com/opc/CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/com/opc/CMakeLists.txt b/src/com/opc/CMakeLists.txt index 3381fa59e..9f89e55b1 100644 --- a/src/com/opc/CMakeLists.txt +++ b/src/com/opc/CMakeLists.txt @@ -17,7 +17,6 @@ forte_add_network_layer(OPC OFF "opc" COpcComLayer opccomlayer "Enable OPC communication") SET(FORTE_COM_OPC_LIB_ROOT "" CACHE PATH "Path to OPC library root directory") SET(FORTE_COM_OPC_BOOST_ROOT "" CACHE PATH "Path to Boost library root directory") -SET(FORTE_COM_OPC_ATL_ROOT "" CACHE PATH "Path to ATL headers directory") if(FORTE_COM_OPC) forte_add_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -32,17 +31,9 @@ if(FORTE_COM_OPC) forte_add_include_directories( ${FORTE_COM_OPC_BOOST_ROOT} ) forte_add_include_directories( ${FORTE_COM_OPC_LIB_ROOT}/include ) - forte_add_include_directories( ${FORTE_COM_OPC_ATL_ROOT}/inc/atl71) forte_add_link_directories( ${FORTE_COM_OPC_LIB_ROOT}/lib ) - forte_add_link_directories( ${FORTE_COM_OPC_ATL_ROOT}/lib/ATL/i386 ) forte_add_link_library( OPCClientToolKit.lib ) - - #change atlsd.lib to atls.lib if you want to compile in release mode - forte_add_link_library( atlsd.lib ) - - #open below if visual studio 2019(msbuild tool 2019) is used - #forte_add_link_library( legacy_stdio_definitions.lib ) else() # Generate error since OPC only works with Windows