Fixed pypylon CI builds without pylon dataprocessing.

basler · Nov 6, 2023 · 28fc4b9 · 28fc4b9
1 parent 27abb57
commit 28fc4b9
Showing 1 changed file with 12 additions and 9 deletions.
diff --git 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