Merge pull request #21 from matrix-io/kp/wiringpi_linking

Fixing wiringPi linking issue - Adding crypto in Cmakes
matrix-io · Mar 2, 2017 · 538d1b9 · 538d1b9
2 parents f5c02cc + ac465fd
commit 538d1b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/debian/files b/debian/files
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
@@ -9,6 +9,9 @@ ADM_EXTRA_WARNINGS()
 
 find_package(Threads)
 find_library (FFTW_LIBRARIES NAMES fftw3f )
+FIND_LIBRARY(WIRINGPI_LIB NAMES wiringPi)
+FIND_LIBRARY(WIRINGPI_DEV_LIB NAMES wiringPiDev)
+FIND_LIBRARY(CRYPT_LIB NAMES crypt)
 
 add_subdirectory(../cpp/driver driver)
 
@@ -41,43 +44,41 @@ add_executable(mic_demo mic_demo.cpp)
   set_property(TARGET mic_demo PROPERTY CXX_STANDARD 11)
   target_link_libraries(mic_demo matrix_creator_hal)
   target_link_libraries(mic_demo ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(mic_demo wiringPi)
+  target_link_libraries(mic_demo ${WIRINGPI_LIB} ${WIRINGPI_DEV_LIB} ${CRYPT_LIB})
 
 add_executable(ir_demo ir_demo.cpp)
   set_property(TARGET ir_demo PROPERTY CXX_STANDARD 11)
   target_link_libraries(ir_demo matrix_creator_hal)
   target_link_libraries(ir_demo ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(ir_demo wiringPi)
+  target_link_libraries(ir_demo ${WIRINGPI_LIB} ${WIRINGPI_DEV_LIB} ${CRYPT_LIB})
 
 add_executable(micarray_recorder micarray_recorder.cpp)
   set_property(TARGET micarray_recorder PROPERTY CXX_STANDARD 11)
   target_link_libraries(micarray_recorder matrix_creator_hal)
   target_link_libraries(micarray_recorder ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(micarray_recorder wiringPi)
+  target_link_libraries(micarray_recorder ${WIRINGPI_LIB} ${WIRINGPI_DEV_LIB} ${CRYPT_LIB})
 
 add_executable(servo_demo servo_demo.cpp)
   set_property(TARGET servo_demo PROPERTY CXX_STANDARD 11)
   target_link_libraries(servo_demo matrix_creator_hal)
   target_link_libraries(servo_demo ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(servo_demo wiringPi)
 
 add_executable(gpio_demo gpio_demo.cpp)
   set_property(TARGET gpio_demo PROPERTY CXX_STANDARD 11)
   target_link_libraries(gpio_demo matrix_creator_hal)
   target_link_libraries(gpio_demo ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(gpio_demo wiringPi)
 
 add_executable(mic_energy mic_energy.cpp)
   set_property(TARGET mic_energy PROPERTY CXX_STANDARD 11)
   target_link_libraries(mic_energy matrix_creator_hal)
   target_link_libraries(mic_energy ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(mic_energy wiringPi)
+  target_link_libraries(mic_energy ${WIRINGPI_LIB} ${WIRINGPI_DEV_LIB} ${CRYPT_LIB})
 
 add_executable(micarray_alsa_pipes micarray_alsa_pipes.cpp)
   set_property(TARGET micarray_alsa_pipes PROPERTY CXX_STANDARD 11)
   target_link_libraries(micarray_alsa_pipes matrix_creator_hal)
   target_link_libraries(micarray_alsa_pipes ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(micarray_alsa_pipes wiringPi)
+  target_link_libraries(micarray_alsa_pipes ${WIRINGPI_LIB} ${WIRINGPI_DEV_LIB} ${CRYPT_LIB})
 
 add_executable(firmware_info firmware_info.cpp)
   set_property(TARGET firmware_info PROPERTY CXX_STANDARD 11)
@@ -98,6 +99,6 @@ add_executable(direction_of_arrival_demo direction_of_arrival_demo.cpp)
   set_property(TARGET direction_of_arrival_demo PROPERTY CXX_STANDARD 11)
   target_link_libraries(direction_of_arrival_demo matrix_creator_hal)
   target_link_libraries(direction_of_arrival_demo ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(direction_of_arrival_demo wiringPi)
+  target_link_libraries(direction_of_arrival_demo ${WIRINGPI_LIB} ${WIRINGPI_DEV_LIB} ${CRYPT_LIB})
   target_link_libraries(direction_of_arrival_demo ${FFTW_LIBRARIES})