Skip to content

Commit

Permalink
[571679] with visual studio build tools 2019, do not need to specify …
Browse files Browse the repository at this point in the history
…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 <[email protected]>
  • Loading branch information
Tibalt authored and azoitl committed Mar 5, 2021
1 parent 5a5954a commit 1cc1f85
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions src/com/opc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand All @@ -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
Expand Down

0 comments on commit 1cc1f85

Please sign in to comment.