Skip to content
Snippets Groups Projects
Commit 72ce2364 authored by Elisabetta Pianori's avatar Elisabetta Pianori
Browse files

Merge branch 'dantrim_galil_found' into 'devel'

Properly check for libGalil,libZaber, and libWaferprob dependencies

See merge request berkeleylab/labRemote!192
parents 418a2851 9f81ceab
No related branches found
No related tags found
No related merge requests found
...@@ -10,18 +10,14 @@ if ( NOT "${LIBGCLIB_FOUND}" ) ...@@ -10,18 +10,14 @@ if ( NOT "${LIBGCLIB_FOUND}" )
endif() endif()
# #
# Prepare the library # Prepare the library
add_library(Galil SHARED) add_library(Galil SHARED)
target_sources(Galil target_sources(Galil
PRIVATE PRIVATE
arrays.cpp arrays.cpp
gclibo.cpp gclibo.cpp
) )
if(APPLE) target_link_libraries(Galil ${LIBGCLIB_LIBRARIES} ${zlib_libraries} )
target_link_libraries(Galil /Applications/gclib/dylib/gclib.0.dylib /Applications/gclib/dylib/gclibo.0.dylib)
else()
target_link_libraries(Galil gclib gclibo ${ZLIB_LIBRARIES} )
endif()
# Tell rest of labRemote that the library exists # Tell rest of labRemote that the library exists
set(libGalil_FOUND TRUE PARENT_SCOPE) set(libGalil_FOUND TRUE PARENT_SCOPE)
...@@ -2,4 +2,5 @@ add_library(Zaber SHARED) ...@@ -2,4 +2,5 @@ add_library(Zaber SHARED)
target_sources(Zaber target_sources(Zaber
PRIVATE PRIVATE
za_serial.cpp za_serial.cpp
) )
target_include_directories(Zaber PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment