diff --git a/CMakeLists.txt b/CMakeLists.txt index 468167ea..ead48206 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall") # Configure the use of QT4 find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET) -# add protocol buffers +# add protocol buffers (make sure to find the static version) +set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD ${CMAKE_FIND_LIBRARY_SUFFIXES}) +set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") find_package(Protobuf REQUIRED) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_OLD}) +set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD) #add libusb and pthreads find_package(libusb-1.0 REQUIRED) diff --git a/deploy/hyperion.tar.gz b/deploy/hyperion.tar.gz deleted file mode 100644 index 74e192a8..00000000 Binary files a/deploy/hyperion.tar.gz and /dev/null differ diff --git a/deploy/hyperion.tar.gz.REMOVED.git-id b/deploy/hyperion.tar.gz.REMOVED.git-id new file mode 100644 index 00000000..9770ad39 --- /dev/null +++ b/deploy/hyperion.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +69287788649383ba7926e315debc69b7f4bd82a0 \ No newline at end of file