diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake --- a/thirdparty/thirdparty.cmake 2019-03-24 19:50:39.000000000 +0100 +++ b/thirdparty/thirdparty.cmake 2019-03-29 18:30:18.853081815 +0100 @@ -1295,23 +1295,23 @@ # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty remove_definitions(-DHAVE_QHY_CAMERA=1) - endif() # OPENSOURCE_ONLY + set(LIBOPENSSAG openssag) + set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src) + include_directories(${libopenssag_dir}) + set(libOPENSSAG_SRC + ${libopenssag_dir}/firmware.h + ${libopenssag_dir}/loader.cpp + ${libopenssag_dir}/openssag_priv.h + ${libopenssag_dir}/openssag.cpp + ${libopenssag_dir}/openssag.h + ) + add_library(OpenSSAG ${libOPENSSAG_SRC}) + target_link_libraries(OpenSSAG openphd_libusb) + target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src) + set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG) + set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/") - set(LIBOPENSSAG openssag) - set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src) - include_directories(${libopenssag_dir}) - set(libOPENSSAG_SRC - ${libopenssag_dir}/firmware.h - ${libopenssag_dir}/loader.cpp - ${libopenssag_dir}/openssag_priv.h - ${libopenssag_dir}/openssag.cpp - ${libopenssag_dir}/openssag.h - ) - add_library(OpenSSAG ${libOPENSSAG_SRC}) - target_link_libraries(OpenSSAG openphd_libusb) - target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src) - set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG) - set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/") + endif() # OPENSOURCE_ONLY # math library is needed, and should be one of the last things to link to here find_library(mathlib NAMES m)