mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Ensured protobuf static library selection in cmake
Former-commit-id: d56d059df6d4964becd8d5ebfe3bcbd9bb8c4d1a
This commit is contained in:
parent
1e2d7188b1
commit
4e95916cb1
@ -48,8 +48,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
|
|||||||
# Configure the use of QT4
|
# Configure the use of QT4
|
||||||
find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
|
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)
|
find_package(Protobuf REQUIRED)
|
||||||
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_OLD})
|
||||||
|
set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD)
|
||||||
|
|
||||||
#add libusb and pthreads
|
#add libusb and pthreads
|
||||||
find_package(libusb-1.0 REQUIRED)
|
find_package(libusb-1.0 REQUIRED)
|
||||||
|
Binary file not shown.
1
deploy/hyperion.tar.gz.REMOVED.git-id
Normal file
1
deploy/hyperion.tar.gz.REMOVED.git-id
Normal file
@ -0,0 +1 @@
|
|||||||
|
69287788649383ba7926e315debc69b7f4bd82a0
|
Loading…
Reference in New Issue
Block a user