@@ -122,22 +122,16 @@ if(WIN32 AND (PYLON_FOUND OR pylon_FOUND))
122
122
)
123
123
copy_files_matching (${PYLON_BIN_DIR} pypylon "${DP_PATTERNS} " )
124
124
125
- # Ensure PYLON_ROOT is available for plugin directories
126
- if (NOT DEFINED PYLON_ROOT AND DEFINED ENV{PYLON_DEV_DIR} )
127
- set (PYLON_ROOT $ENV{PYLON_DEV_DIR} )
125
+ # Windows data processing plugin directories
126
+ # Use PYLON_BIN_DIR for the base runtime directory
127
+ set (DP_PLUGIN_DIR "${PYLON_BIN_DIR} /pylonDataProcessingPlugins" )
128
+ if (EXISTS "${DP_PLUGIN_DIR} " )
129
+ copy_directory_excluding_editors ("${DP_PLUGIN_DIR} " "pylonDataProcessingPlugins" )
128
130
endif ()
129
131
130
- # Data processing plugin directories (excluding Editor packages)
131
- if (DEFINED PYLON_ROOT )
132
- set (DP_PLUGIN_DIR "${PYLON_ROOT} /Runtime/pylonDataProcessingPlugins" )
133
- if (EXISTS "${DP_PLUGIN_DIR} " )
134
- copy_directory_excluding_editors ("${DP_PLUGIN_DIR} " "pylonDataProcessingPlugins" )
135
- endif ()
136
-
137
- set (DP_CREATOR_DIR "${PYLON_ROOT} /Runtime/DataProcessingPluginsB" )
138
- if (EXISTS "${DP_CREATOR_DIR} " )
139
- copy_directory_excluding_editors ("${DP_CREATOR_DIR} " "DataProcessingPluginsB" )
140
- endif ()
132
+ set (DP_CREATOR_DIR "${PYLON_BIN_DIR} /DataProcessingPluginsB" )
133
+ if (EXISTS "${DP_CREATOR_DIR} " )
134
+ copy_directory_excluding_editors ("${DP_CREATOR_DIR} " "DataProcessingPluginsB" )
141
135
endif ()
142
136
endif ()
143
137
@@ -165,43 +159,7 @@ elseif(UNIX AND NOT APPLE AND (PYLON_FOUND OR pylon_FOUND))
165
159
set (RUNTIME_PYLON_VERSION ${PYLON_VERSION} )
166
160
endif ()
167
161
168
- if (RUNTIME_PYLON_VERSION VERSION_LESS "6.3.0" )
169
- # Older naming scheme
170
- set (BASE_PATTERNS
171
- "libpylonbase-.*\\ .so"
172
- "libGCBase_.*\\ .so"
173
- "libGenApi_.*\\ .so"
174
- "liblog4cpp_.*\\ .so"
175
- "libLog_.*\\ .so"
176
- "libNodeMapData_.*\\ .so"
177
- "libXmlParser_.*\\ .so"
178
- "libMathParser_.*\\ .so"
179
- )
180
-
181
- set (GIGE_PATTERNS
182
- "libpylon_TL_gige-.*\\ .so"
183
- "libgxapi-.*\\ .so"
184
- )
185
-
186
- set (USB_PATTERNS
187
- "libpylon_TL_usb-.*\\ .so"
188
- "libuxapi-.*\\ .so"
189
- "pylon-libusb-.*\\ .so"
190
- )
191
-
192
- set (CAMEMU_PATTERNS
193
- "libpylon_TL_camemu-.*\\ .so"
194
- )
195
-
196
- set (EXTRA_PATTERNS
197
- "libpylonutility-.*\\ .so"
198
- )
199
-
200
- set (GENTL_PATTERNS
201
- "libpylon_TL_gtc-.*\\ .so"
202
- )
203
-
204
- elseif (RUNTIME_PYLON_VERSION VERSION_LESS "9.0.3" )
162
+ if (RUNTIME_PYLON_VERSION VERSION_LESS "9.0.3" )
205
163
# Newer naming scheme
206
164
set (BASE_PATTERNS
207
165
"libpylonbase\\ .so\\ .[0-9]+$"
0 commit comments