Feature/160 fmuproxy integration

CMakeLists.txt

@@ -12,6 +12,7 @@ option(CSECORE_BUILD_APIDOC "Build API documentation" ON)
 option(CSECORE_BUILD_PRIVATE_APIDOC "Build private API documentation" OFF)
 option(CSECORE_STANDALONE_INSTALLATION "Whether to build for a standalone installation (Linux only; sets a relative RPATH)" OFF)
 option(CSECORE_USING_CONAN "Whether Conan is used for package management" OFF)
+option(CSECORE_WITH_FMUPROXY "Whether or not to build with fmuproxy integration" OFF)
 
 # ==============================================================================
 # Global internal configuration
@@ -67,6 +68,12 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         # should not be a problem, so we disable the warning.
         add_compile_options("/wd4251")
     endif()
+    if (CSECORE_WITH_FMUPROXY)
+        #warning C4245: 'return': conversion from 'int' to 'SOCKET', signed/unsigned mismatch
+        add_compile_options("/wd4245")
+        #warning C4706: assignment within conditional expression
+        add_compile_options("/wd4706")
+    endif()
     add_definitions("-D_SCL_SECURE_NO_WARNINGS" "-D_CRT_SECURE_NO_WARNINGS")
 endif()
 
@@ -115,6 +122,9 @@ find_package(Boost REQUIRED COMPONENTS ${Boost_components})
 find_package(FMILibrary REQUIRED)
 find_package(LIBZIP REQUIRED)
 find_package(nlohmann_json REQUIRED)
+if(CSECORE_WITH_FMUPROXY)
+    find_package(Thrift REQUIRED)
+endif()
 
 # ==============================================================================
 # Targets

Jenkinsfile

@@ -21,6 +21,7 @@ pipeline {
                         stage('Configure Conan') {
                             steps {
                                 sh 'conan remote add osp https://osp-conan.azurewebsites.net/artifactory/api/conan/conan-local --force'
+                                sh 'conan remote add helmesjo https://api.bintray.com/conan/helmesjo/public-conan --force'
                                 sh 'conan user -p $OSP_CONAN_CREDS_PSW -r osp $OSP_CONAN_CREDS_USR'
                             }
                         }
@@ -104,6 +105,34 @@ pipeline {
                         }
                     }
                 }
+                stage('Build on Windows with FMU-proxy support') {
+                    agent { label 'windows' }
+
+                    environment {
+                        CONAN_USER_HOME = "${env.BASE}\\conan-repositories\\${env.EXECUTOR_NUMBER}"
+                        CONAN_USER_HOME_SHORT = "${env.CONAN_USER_HOME}"
+                        OSP_CONAN_CREDS = credentials('jenkins-osp-conan-creds')
+                        CSE_CONAN_CHANNEL = "${env.BRANCH_NAME}".replaceAll("/", "_")
+                    }
+
+                    stages {
+                        stage('Configure Conan') {
+                            steps {
+                                sh 'conan remote add osp https://osp-conan.azurewebsites.net/artifactory/api/conan/conan-local --force'
+                                sh 'conan remote add helmesjo https://api.bintray.com/conan/helmesjo/public-conan --force'
+                                sh 'conan user -p $OSP_CONAN_CREDS_PSW -r osp $OSP_CONAN_CREDS_USR'
+                            }
+                        }
+                        stage('Build Release') {
+                            steps {
+                                dir('release-build-fmuproxy') {
+                                    bat 'conan install ../cse-core -s build_type=Release -o fmuproxy=True -b missing'
+                                    bat 'conan package ../cse-core -pf package/windows/release'
+                                }
+                            }
+                        }
+                    }
+                }
                 stage ( 'Build on Linux with Conan' ) {
                     agent { 
                         dockerfile {
@@ -125,6 +154,7 @@ pipeline {
                         stage('Configure Conan') {
                             steps {
                                 sh 'conan remote add osp https://osp-conan.azurewebsites.net/artifactory/api/conan/conan-local --force'
+                                sh 'conan remote add helmesjo https://api.bintray.com/conan/helmesjo/public-conan --force'
                                 sh 'conan user -p $OSP_CONAN_CREDS_PSW -r osp $OSP_CONAN_CREDS_USR'
                             }
                         }
@@ -175,7 +205,6 @@ pipeline {
                                 }
                             }
                         }
-
                         stage ('Test Release') {
                             steps {
                                 dir('release-build-conan') {
@@ -209,6 +238,41 @@ pipeline {
                         }
                     }
                 }
+                stage ( 'Build on Linux with Conan & FMU-proxy support' ) {
+                    agent {
+                        dockerfile {
+                            filename 'Dockerfile.conan-build'
+                            dir 'cse-core/.dockerfiles'
+                            label 'linux && docker'
+                            args '-v ${HOME}/jenkins_slave/conan-repositories/${EXECUTOR_NUMBER}:/conan_repo'
+                        }
+                    }
+
+                    environment {
+                        CONAN_USER_HOME = '/conan_repo'
+                        CONAN_USER_HOME_SHORT = 'None'
+                        OSP_CONAN_CREDS = credentials('jenkins-osp-conan-creds')
+                        CSE_CONAN_CHANNEL = "${env.BRANCH_NAME}".replaceAll("/", "_")
+                    }
+
+                    stages {
+                        stage('Configure Conan') {
+                            steps {
+                                sh 'conan remote add osp https://osp-conan.azurewebsites.net/artifactory/api/conan/conan-local --force'
+                                sh 'conan remote add helmesjo https://api.bintray.com/conan/helmesjo/public-conan --force'
+                                sh 'conan user -p $OSP_CONAN_CREDS_PSW -r osp $OSP_CONAN_CREDS_USR'
+                            }
+                        }
+                        stage('Build Release') {
+                            steps {
+                                dir('release-build-conan-fmuproxy') {
+                                    sh 'conan install ../cse-core -s compiler.libcxx=libstdc++11 -s build_type=Release -o fmuproxy=True -b missing'
+                                    sh 'conan package ../cse-core -pf package/linux/release'
+                                }
+                            }
+                        }
+                    }
+                }
                 stage ( 'Build on Linux with Docker' ) {
                     agent { 
                         dockerfile { 

cmake/FindThrift.cmake

@@ -0,0 +1,36 @@
+# Find Thrift
+#
+# Find the native Thrift headers and libraries.
+#
+#   THRIFT_INCLUDE_DIRS   - where to find thrift/thrift.h
+#   THRIFT_LIBRARIES      - List of libraries when using Thrift.
+#   THRIFT_FOUND          - True if Thrift found.
+#
+
+find_path(THRIFT_INCLUDE_DIR NAMES thrift/Thrift.h)
+mark_as_advanced(THRIFT_INCLUDE_DIR)
+
+find_library(THRIFT_LIBRARY NAMES thrift thriftmd thriftmdd)
+mark_as_advanced(THRIFT_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(THRIFT
+        REQUIRED_VARS THRIFT_LIBRARY THRIFT_INCLUDE_DIR)
+
+if (THRIFT_FOUND)
+
+    set(THRIFT_INCLUDE_DIRS ${THRIFT_INCLUDE_DIR})
+
+    if (NOT THRIFT_LIBRARIES)
+        set(THRIFT_LIBRARIES ${THRIFT_LIBRARY})
+    endif()
+
+    if (NOT TARGET thrift::thrift)
+        add_library(thrift::thrift UNKNOWN IMPORTED)
+        set_target_properties(thrift::thrift PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${THRIFT_INCLUDE_DIR}")
+        set_property(TARGET thrift::thrift APPEND PROPERTY
+                IMPORTED_LOCATION "${THRIFT_LIBRARY}")
+    endif()
+
+endif()

conanfile.py

@@ -22,7 +22,9 @@ class CSECoreConan(ConanFile):
         "jsonformoderncpp/3.5.0@vthiery/stable"
         )
 
+    options = {"fmuproxy": [True, False]}
     default_options = (
+        "fmuproxy=False",
         "boost:shared=True",
         "libzip:shared=True"
         )
@@ -32,12 +34,19 @@ def imports(self):
         self.copy("*.dll", dst=binDir, keep_path=False)
         self.copy("*.pdb", dst=binDir, keep_path=False)
 
+    def requirements(self):
+        if self.options.fmuproxy:
+            self.requires("OpenSSL/1.0.2o@conan/stable")
+            self.requires("thrift/0.12.0@helmesjo/stable")
+
     def configure_cmake(self):
         cmake = CMake(self)
         cmake.parallel = False # Needed to keep stable build on Jenkins Windows Node
         cmake.definitions["CSECORE_USING_CONAN"] = "ON"
         if self.settings.build_type == "Debug":
             cmake.definitions["CSECORE_BUILD_PRIVATE_APIDOC"] = "ON"
+        if self.options.fmuproxy:
+            cmake.definitions["CSECORE_WITH_FMUPROXY"] = "ON"
         cmake.configure()
         return cmake
 
@@ -51,4 +60,4 @@ def package(self):
         cmake = self.configure_cmake()
         self.run('cmake --build %s --target install-doc' % (self.build_folder))
         cmake.install()
-        
+