fixing ubuntu CI build

ukaea · Dec 4, 2023 · ddceb70 · ddceb70
1 parent 0cfbe48
commit ddceb70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/source/client2/CMakeLists.txt b/source/client2/CMakeLists.txt
@@ -71,6 +71,7 @@ endif()
 
 set( CLIENT_OBJS
   $<TARGET_OBJECTS:client2-objects>
+  $<TARGET_OBJECTS:c_api-objects>
   $<TARGET_OBJECTS:clientserver-client-objects>
   $<TARGET_OBJECTS:cache-objects>
   $<TARGET_OBJECTS:logging-client-objects>
@@ -80,6 +81,7 @@ set( CLIENT_OBJS
 
 set( FATCLIENT_OBJS
   $<TARGET_OBJECTS:fatclient2-objects>
+  $<TARGET_OBJECTS:fatc_api-objects>
   $<TARGET_OBJECTS:fatserver-objects>
   $<TARGET_OBJECTS:fatclientserver-objects>
   $<TARGET_OBJECTS:structures-server-objects>

diff --git a/source/wrappers/python/setup.py.in b/source/wrappers/python/setup.py.in
@@ -33,14 +33,14 @@ uda_lib_names = '@UDA_LIBS@'.split(';') if '@UDA_LIBS@' else []
 build_fat = os.environ.get('UDA_FAT_PYTHON', False)
 if build_fat:
     uda_libs = [
-        'libfat@PROJECT_NAME@_client2.' + stalib_ext,
+        'libfat@PROJECT_NAME@_client.' + stalib_ext,
         'lib@PROJECT_NAME@_plugins.' + stalib_ext,
     ] + ['lib@PROJECT_NAME@_' + name + '.' + stalib_ext for name in uda_lib_names]
     extra_libs = ['xml2', 'pq']
     extra_macros = [('FATCLIENT', None)]
 else:
     uda_libs = [
-        'lib@PROJECT_NAME@_client2.' + stalib_ext,
+        'lib@PROJECT_NAME@_client.' + stalib_ext,
     ] + ['lib@PROJECT_NAME@_' + name + '.' + stalib_ext for name in uda_lib_names]
     extra_libs = '@EXTRA_LIBS@'.split(';') if '@EXTRA_LIBS@' else []
     extra_macros = []