Skip to content
Snippets Groups Projects
Commit d00bfbf7 authored by Tristan Walter's avatar Tristan Walter
Browse files

Merge branch 'master' into gl2

parents 548781b3 4962cdda
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Application/src/commons/CMakeModules/FindBaslerPylon.cmake
+ 4
− 4
View file @ d00bfbf7
...@@ -28,28 +28,28 @@ FIND_PATH( PYLON_INCLUDE_DIR pylon/PylonBase.h ...@@ -28,28 +28,28 @@ FIND_PATH( PYLON_INCLUDE_DIR pylon/PylonBase.h
FIND_LIBRARY( PYLONBASE_LIBRARY FIND_LIBRARY( PYLONBASE_LIBRARY
NAMES NAMES
pylonbase PylonBase_MD_VC100 PylonBase_v6_0 pylonbase PylonBase_MD_VC100 PylonBase_v6_0 PylonBase_v5_2
PATHS PATHS
${PYLON_LIBRARY} ${PYLON_LIBRARY}
) )
FIND_LIBRARY( PYLON_UTILITY_LIBRARY FIND_LIBRARY( PYLON_UTILITY_LIBRARY
NAMES NAMES
pylonutility PylonUtility_MD_VC100 PylonUtility_v6_0 pylonutility PylonUtility_MD_VC100 PylonUtility_v6_0 PylonUtility_v5_2
PATHS PATHS
${PYLON_LIBRARY} ${PYLON_LIBRARY}
) )
FIND_LIBRARY( PYLON_GEN_LIBRARY FIND_LIBRARY( PYLON_GEN_LIBRARY
NAMES NAMES
GenApi_gcc_v3_0_Basler_pylon_v5_0 GenApi_MD_VC141_v3_1_Basler_pylon GenApi_gcc_v3_0_Basler_pylon_v5_0 GenApi_gcc_v3_1_Basler_pylon GenApi_MD_VC141_v3_1_Basler_pylon
PATHS PATHS
${PYLON_LIBRARY} ${PYLON_LIBRARY}
) )
FIND_LIBRARY( PYLON_GEN2_LIBRARY FIND_LIBRARY( PYLON_GEN2_LIBRARY
NAMES NAMES
GCBase_gcc_v3_0_Basler_pylon_v5_0 GCBase_MD_VC141_v3_1_Basler_pylon GCBase_gcc_v3_0_Basler_pylon_v5_0 GCBase_gcc_v3_1_Basler_pylon GCBase_MD_VC141_v3_1_Basler_pylon
PATHS PATHS
${PYLON_LIBRARY} ${PYLON_LIBRARY}
) )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment