From 28fc4b95f4fa3da570a7ca377d177ab47d863f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rennfanz=2C=20Bj=C3=B6rn?= Date: Mon, 6 Nov 2023 15:06:27 +0100 Subject: [PATCH] Fixed pypylon CI builds without pylon dataprocessing. --- setup.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index bf46299..11e8e62 100755 --- a/setup.py +++ b/setup.py @@ -777,23 +777,26 @@ def __init__(self): config_cflags = self.call_pylon_config("--cflags") self.ExtraCompileArgs.extend(config_cflags.split()) - config_cflags = self.call_pylon_dataprocessing_config("--cflags") - self.ExtraCompileArgs.extend(config_cflags.split()) - self.ExtraCompileArgs = list(dict.fromkeys(self.ExtraCompileArgs)) #remove duplicates + if self.include_pylon_data_processing(): + config_cflags = self.call_pylon_dataprocessing_config("--cflags") + self.ExtraCompileArgs.extend(config_cflags.split()) + self.ExtraCompileArgs = list(dict.fromkeys(self.ExtraCompileArgs)) #remove duplicates print("ExtraCompileArgs:", self.ExtraCompileArgs) config_libs = self.call_pylon_config("--libs") self.ExtraLinkArgs.extend(config_libs.split()) - config_libs = self.call_pylon_dataprocessing_config("--libs") - self.ExtraLinkArgs.extend(config_libs.split()) - self.ExtraLinkArgs = list(dict.fromkeys(self.ExtraLinkArgs)) #remove duplicates + if self.include_pylon_data_processing(): + config_libs = self.call_pylon_dataprocessing_config("--libs") + self.ExtraLinkArgs.extend(config_libs.split()) + self.ExtraLinkArgs = list(dict.fromkeys(self.ExtraLinkArgs)) #remove duplicates print("ExtraLinkArgs:", self.ExtraLinkArgs) config_libdir = self.call_pylon_config("--libdir") self.LibraryDirs.extend(config_libdir.split()) - config_libdir = self.call_pylon_dataprocessing_config("--libdir") - self.LibraryDirs.extend(config_libdir.split()) - self.LibraryDirs = list(dict.fromkeys(self.LibraryDirs)) #remove duplicates + if self.include_pylon_data_processing(): + config_libdir = self.call_pylon_dataprocessing_config("--libdir") + self.LibraryDirs.extend(config_libdir.split()) + self.LibraryDirs = list(dict.fromkeys(self.LibraryDirs)) #remove duplicates print("LibraryDirs:", self.LibraryDirs) # adjust runtime files according to pylon version