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