fixes from building on Ubuntu

ukaea · Dec 3, 2023 · fb553a7 · fb553a7
1 parent 4d98c97
commit fb553a7
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 16 deletions.
diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
@@ -101,7 +101,8 @@ macro( uda_plugin )
 
   filter_lib_list( "${PLUGIN_EXTRA_LINK_LIBS}" FILTERED_LINK_LIBS debug optimized ) 
   set( LIBRARIES ${LIBRARIES} ${FILTERED_LINK_LIBS} )
-
+
+  message( WARNING ">>>> ${PLUGIN_LIBNAME} ${LIBRARIES}" ) 
   target_link_libraries( ${PLUGIN_LIBNAME} PRIVATE ${LIBRARIES} )
 
   install(

diff --git a/source/authentication/udaClientSSL.h b/source/authentication/udaClientSSL.h
@@ -23,8 +23,9 @@
 #define VERIFY_DEPTH 4
 #define X509STRINGSIZE 256
 
+#include <export.h>
+
 #include <client/udaClientHostList.h>
-#include <clientserver/export.h>
 #include <clientserver/socketStructs.h>
 
 bool getUdaClientSSLDisabled();

diff --git a/source/authentication/udaServerSSL.h b/source/authentication/udaServerSSL.h
@@ -11,7 +11,7 @@
 // Server host addressed beginng with SSL:// are assumed to be using SSL authentication. The SSL:// prefix is removed to
 // make the connection.
 
-#include <clientserver/export.h>
+#include <export.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/source/c_api/CMakeLists.txt b/source/c_api/CMakeLists.txt
@@ -5,6 +5,17 @@
 find_package( fmt REQUIRED )
 #find_package( LibXml2 REQUIRED )
 
+set( LIBS fmt::fmt )
+
+if( WIN32 OR MINGW )
+
+else()
+  find_package( TIRPC QUIET )
+  if( TIRPC_FOUND )
+    list( APPEND LIBS TIRPC::TIRPC )
+  endif()
+endif()
+
 ########################################################################################################################
 # Sources
 
@@ -19,8 +30,8 @@ set( SRC_FILES
 add_library( c_api-objects OBJECT ${SRC_FILES} )
 add_library( fatc_api-objects OBJECT ${SRC_FILES} )
 
-target_link_libraries( c_api-objects PUBLIC fmt::fmt )
-target_link_libraries( fatc_api-objects PUBLIC fmt::fmt )
+target_link_libraries( c_api-objects PUBLIC ${LIBS} )
+target_link_libraries( fatc_api-objects PUBLIC ${LIBS} )
 
 target_compile_definitions( fatc_api-objects PUBLIC -DFATCLIENT )
 
@@ -33,4 +44,4 @@ target_include_directories(
   fatc_api-objects PRIVATE
   ${CMAKE_SOURCE_DIR}/source
   ${CMAKE_SOURCE_DIR}/source/include
-)
+)
diff --git a/source/plugins/CMakeLists.txt b/source/plugins/CMakeLists.txt
@@ -71,6 +71,7 @@ target_include_directories( plugins-objects PRIVATE
   ${CMAKE_SOURCE_DIR}/source
   ${CMAKE_SOURCE_DIR}/source/include
 )
+target_link_libraries( plugins-objects PRIVATE ${LIBS} )
 
 add_library( plugins-static STATIC $<TARGET_OBJECTS:plugins-objects> )
 if( BUILD_SHARED_LIBS )

diff --git a/source/plugins/uda/CMakeLists.txt b/source/plugins/uda/CMakeLists.txt
@@ -9,14 +9,15 @@ if( NOT LIBXML2_FOUND )
   return()
 endif()
 
+set( LIBS LibXml2::LibXml2 fmt::fmt )
+
 if( WIN32 OR MINGW )
   find_package( XDR REQUIRED )
-  include_directories( ${XDR_INCLUDE_DIR} )
+  list( APPEND LIBS XDR::XDR )
 else()
   find_package( TIRPC QUIET )
   if( TIRPC_FOUND )
-    add_definitions( -D__TIRPC__ )
-    include_directories( ${TIRPC_INCLUDE_DIR} )
+    list( APPEND LIBS TIRPC::TIRPC )
   endif()
 endif()
 
@@ -29,11 +30,6 @@ uda_plugin(
   EXAMPLE "UDA::get(host=idam0, port=56565, signal=ip, source=12345)"
   LIBNAME uda_plugin
   SOURCES uda_plugin.cpp
-  EXTRA_INCLUDE_DIRS
-    ${LIBXML2_INCLUDE_DIR}
-    ${CMAKE_SOURCE_DIR}/client
   EXTRA_LINK_LIBS
-    ${LIBXML2_LIBRARIES}
-    ${OPENSSL_LIBRARIES}
-    fmt::fmt
+    ${LIBS}
 )
diff --git a/source/structures/CMakeLists.txt b/source/structures/CMakeLists.txt
@@ -10,7 +10,7 @@ if( WIN32 OR MINGW )
   list( APPEND LIBS XDR::XDR )
 else()
   find_package( TIRPC QUIET )
-  list( APPEND TIRPC::TIRPC )
+  list( APPEND LIBS TIRPC::TIRPC )
 endif()
 
 ########################################################################################################################
@@ -31,6 +31,7 @@ target_include_directories( structures-client-objects PRIVATE
   ${CMAKE_SOURCE_DIR}/source
   ${CMAKE_SOURCE_DIR}/source/include
 )
+target_link_libraries( structures-client-objects PRIVATE ${LIBS} )
 
 if( NOT CLIENT_ONLY )
   add_library( structures-server-objects OBJECT ${SRC_FILES} )
@@ -39,4 +40,5 @@ if( NOT CLIENT_ONLY )
     ${CMAKE_SOURCE_DIR}/source
     ${CMAKE_SOURCE_DIR}/source/include
   )
+  target_link_libraries( structures-server-objects PRIVATE ${LIBS} )
 endif()
diff --git a/source/wrappers/c++/CMakeLists.txt b/source/wrappers/c++/CMakeLists.txt
@@ -57,6 +57,7 @@ target_include_directories( cpp-objects PRIVATE
   ${CMAKE_SOURCE_DIR}/source
   ${CMAKE_SOURCE_DIR}/source/include
 )
+target_link_libraries( cpp-objects PRIVATE ${LIBS} )
 
 set( CLIENT_OBJS
   $<TARGET_OBJECTS:client-objects>
@@ -83,6 +84,7 @@ if( NOT CLIENT_ONLY )
     ${CMAKE_SOURCE_DIR}/source
     ${CMAKE_SOURCE_DIR}/source/include
   )
+  target_link_libraries( fatcpp-objects PRIVATE ${LIBS} )
 
   set( FATCLIENT_OBJS
     $<TARGET_OBJECTS:fatclient-objects>