From ddceb701a6030a3ce968f78777d91a8b073a7a31 Mon Sep 17 00:00:00 2001 From: Jonathan Hollocombe Date: Mon, 4 Dec 2023 16:40:58 +0000 Subject: [PATCH] fixing ubuntu CI build --- source/client2/CMakeLists.txt | 2 ++ source/wrappers/python/setup.py.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/client2/CMakeLists.txt b/source/client2/CMakeLists.txt index 6f4947f1..77d845e8 100755 --- a/source/client2/CMakeLists.txt +++ b/source/client2/CMakeLists.txt @@ -71,6 +71,7 @@ endif() set( CLIENT_OBJS $ + $ $ $ $ @@ -80,6 +81,7 @@ set( CLIENT_OBJS set( FATCLIENT_OBJS $ + $ $ $ $ diff --git a/source/wrappers/python/setup.py.in b/source/wrappers/python/setup.py.in index 92de4173..c94e793f 100644 --- 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 = []