Conan package for plugins

CMakeLists.txt

@@ -2,8 +2,8 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 1)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 3)
-set(AGENT_VERSION_RC "_RC2")
+set(AGENT_VERSION_BUILD 2)
+set(AGENT_VERSION_RC "_RC1")
 
 # This minimum version is to support Visual Studio 2017 and C++ feature checking and FetchContent
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
@@ -15,6 +15,7 @@ if(POLICY CMP0077)
 endif()
 
 option(AGENT_ENABLE_UNITTESTS "Enables the agent's unit tests" ON)
+option(SHARED_AGENT_LIB "Generate shared agent library. Conan options: shared" OFF)
 set(INSTALL_GTEST OFF FORCE)
 
 project(cppagent LANGUAGES C CXX)
@@ -24,9 +25,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CXX_COMPILE_FEATURES cxx_std_17)
+set(SHARED_AGENT_LIB OFF CACHE BOOL "Build Agent Lib as shared library")
 
-set(WITH_PYTHON OFF CACHE STRING "With Python Support")
-set(WITH_RUBY OFF CACHE STRING "With Ruby Support")
+set(WITH_RUBY ON CACHE STRING "With Ruby Support")
 
 # By default only generate 2 configurations (Debug and Release) for simplicity.
 # The user can change this option if required for the additional ones such as 'RelWithDebInfo'.
@@ -64,7 +65,11 @@ if(MSVC)
 endif()
 
 if (UNIX)
-  add_compile_options(-fPIC -Wno-psabi -fvisibility-inlines-hidden -fvisibility=hidden)
+  if (SHARED_AGENT_LIB)
+    add_compile_options(-fPIC -Wno-psabi -fvisibility-inlines-hidden)
+  else()
+    add_compile_options(-fPIC -Wno-psabi -fvisibility-inlines-hidden -fvisibility=hidden)
+  endif()
 ENDIF()
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
@@ -73,17 +78,16 @@ if (CONAN_USER_MRUBY_mruby)
   set(WITH_RUBY ON FORCE)
 endif()
 
-conan_basic_setup(TARGETS)
+conan_basic_setup(KEEP_RPATHS TARGETS)
 
-if(WITH_PYTHON)
-  set(Python_USE_STATIC_LIBS ON)
+if(SHARED_AGENT_LIB)
+  set(CMAKE_BUILD_RPATH "@load_path/;@executable_path/;@load_path/../lib;@executable_path/../lib")
 
-  find_package(Python3 COMPONENTS Interpreter Development Development.Embed)
-  message("Include dirs of Python: " ${Python3_INCLUDE_DIRS} )
-  message("Libs of Python: " ${Python3_LIBRARIES} )
+  if (MSVC)
+    include(InstallRequiredSystemLibraries)
+  endif()
 endif()
 
-include(cmake/msvc_use_static_runtime.cmake)
 include(cmake/osx_no_app_or_frameworks.cmake)
 include(cmake/ClangFormat.cmake)
 include(cmake/ClangTidy.cmake)

agent/CMakeLists.txt

@@ -4,15 +4,12 @@ if(WIN32)
   # Version info
   string(TIMESTAMP AGENT_VERSION_TIME "%Y-%m-%dT%H:%M:%SZ" UTC)
   set(RESOURCE_FILE "${PROJECT_BINARY_DIR}/agent/version.rc")
-  configure_file("${CMAKE_CURRENT_LIST_DIR}/../src/version.rc.in" "${RESOURCE_FILE}")
+  configure_file("${CMAKE_CURRENT_LIST_DIR}/../src/mtconnect/version.rc.in" "${RESOURCE_FILE}")
   list(APPEND AGENT_SOURCES "${RESOURCE_FILE}")
 endif()
 
 add_executable(agent ${AGENT_SOURCES})
 
-set_property(TARGET agent PROPERTY
-  MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-
 if(WITH_PYTHON)
   target_compile_definitions(
     agent
@@ -36,11 +33,20 @@ endif()
 
 target_link_libraries(
   agent
-  PRIVATE
+  PUBLIC
   agent_lib
   $<$<PLATFORM_ID:Windows>:shlwapi>
   )
 
 target_clangtidy_setup(agent_lib)
 
 install(TARGETS agent RUNTIME DESTINATION bin)
+
+
+if(SHARED_AGENT_LIB AND MSVC)
+  set(CMAKE_INSTALL_DEBUG_LIBRARIES ON)  
+  include(InstallRequiredSystemLibraries)
+  install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION bin COMPONENT Libraries)
+  install(DIRECTORY "${PROJECT_BINARY_DIR}/bin/" DESTINATION bin COMPONENT Libraries
+           FILES_MATCHING PATTERN "*.dll")
+endif()

agent/cppagent.cpp

@@ -16,11 +16,11 @@
 //
 
 #include <boost/asio.hpp>
-#include "agent.hpp"
-#include "configuration/agent_config.hpp"
+#include "mtconnect/agent.hpp"
+#include "mtconnect/configuration/agent_config.hpp"
 
-#include "fcntl.h"
-#include "sys/stat.h"
+#include <fcntl.h>
+#include <sys/stat.h>
 
 #include <cstring>