Convert tabs to spaces
This commit is contained in:
parent
f49b04b4e0
commit
323c231d36
@ -25,7 +25,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-g -O3")
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
|
||||
endif()
|
||||
|
||||
set(Boost_USE_STATIC_LIBS OFF)
|
||||
@ -67,7 +67,6 @@ if(GST_BUILD)
|
||||
endif(RPI_BUILD)
|
||||
message(STATUS "${GST_LIBRARIES}")
|
||||
endif(GST_BUILD)
|
||||
|
||||
|
||||
add_subdirectory(openauto)
|
||||
add_subdirectory(btservice)
|
||||
|
@ -1,45 +1,45 @@
|
||||
set (AASDK_DIR ~/aasdk)
|
||||
|
||||
find_path(AASDK_INCLUDE_DIR
|
||||
aasdk/Version.hpp
|
||||
PATHS ${AASDK_DIR}
|
||||
PATH_SUFFIXES include
|
||||
aasdk/Version.hpp
|
||||
PATHS ${AASDK_DIR}
|
||||
PATH_SUFFIXES include
|
||||
)
|
||||
|
||||
find_path(AASDK_PROTO_INCLUDE_DIR
|
||||
aasdk_proto/AbsoluteInputEventData.pb.h
|
||||
PATHS ${AASDK_DIR}
|
||||
aasdk_proto/AbsoluteInputEventData.pb.h
|
||||
PATHS ${AASDK_DIR}
|
||||
)
|
||||
|
||||
find_path(AASDK_LIB_DIR
|
||||
libaasdk.so
|
||||
PATHS ${AASDK_DIR}
|
||||
PATH_SUFFIXES lib
|
||||
libaasdk.so
|
||||
PATHS ${AASDK_DIR}
|
||||
PATH_SUFFIXES lib
|
||||
)
|
||||
|
||||
if (AASDK_INCLUDE_DIR AND AASDK_PROTO_INCLUDE_DIR AND AASDK_LIB_DIR)
|
||||
set(AASDK_FOUND TRUE)
|
||||
set(AASDK_FOUND TRUE)
|
||||
endif()
|
||||
|
||||
if (AASDK_FOUND)
|
||||
if (NOT aasdk_FIND_QUIETLY)
|
||||
message(STATUS "Found aasdk:")
|
||||
message(STATUS " - Includes: ${AASDK_INCLUDE_DIR}")
|
||||
message(STATUS " - Includes: ${AASDK_PROTO_INCLUDE_DIR}")
|
||||
message(STATUS " - Libraries: ${AASDK_LIB_DIR}")
|
||||
endif()
|
||||
add_library(aasdk INTERFACE)
|
||||
target_include_directories(aasdk INTERFACE ${AASDK_INCLUDE_DIR} ${AASDK_PROTO_INCLUDE_DIR})
|
||||
set_target_properties(aasdk PROPERTIES INTERFACE_LINK_DIRECTORIES ${AASDK_LIB_DIR})
|
||||
target_link_libraries(aasdk INTERFACE libaasdk.so libaasdk_proto.so)
|
||||
if (NOT aasdk_FIND_QUIETLY)
|
||||
message(STATUS "Found aasdk:")
|
||||
message(STATUS " - Includes: ${AASDK_INCLUDE_DIR}")
|
||||
message(STATUS " - Includes: ${AASDK_PROTO_INCLUDE_DIR}")
|
||||
message(STATUS " - Libraries: ${AASDK_LIB_DIR}")
|
||||
endif()
|
||||
add_library(aasdk INTERFACE)
|
||||
target_include_directories(aasdk INTERFACE ${AASDK_INCLUDE_DIR} ${AASDK_PROTO_INCLUDE_DIR})
|
||||
set_target_properties(aasdk PROPERTIES INTERFACE_LINK_DIRECTORIES ${AASDK_LIB_DIR})
|
||||
target_link_libraries(aasdk INTERFACE libaasdk.so libaasdk_proto.so)
|
||||
else()
|
||||
if (aasdk_FIND_REQUIRED)
|
||||
if(AASDK_INCLUDE_DIR AND NOT AASDK_PROTO_INCLUDE_DIR)
|
||||
message(FATAL_ERROR "aasdk was found but not built. Perform an in-source build.")
|
||||
else()
|
||||
message(FATAL_ERROR "Could not find aasdk")
|
||||
endif()
|
||||
endif()
|
||||
if (aasdk_FIND_REQUIRED)
|
||||
if(AASDK_INCLUDE_DIR AND NOT AASDK_PROTO_INCLUDE_DIR)
|
||||
message(FATAL_ERROR "aasdk was found but not built. Perform an in-source build.")
|
||||
else()
|
||||
message(FATAL_ERROR "Could not find aasdk")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
mark_as_advanced(AASDK_INCLUDE_DIRS AASDK_LIBRARIES)
|
||||
|
@ -1,67 +1,67 @@
|
||||
set (OMX_DIR /opt/vc/)
|
||||
|
||||
find_path(BCM_HOST_INCLUDE_DIR
|
||||
bcm_host.h
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
include
|
||||
bcm_host.h
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
include
|
||||
)
|
||||
|
||||
find_path(BCM_HOST_LIB_DIR
|
||||
libbcm_host.so
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
lib
|
||||
libbcm_host.so
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
lib
|
||||
)
|
||||
|
||||
find_path(ILCLIENT_INCLUDE_DIR
|
||||
ilclient.h
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
src/hello_pi/libs/ilclient
|
||||
ilclient.h
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
src/hello_pi/libs/ilclient
|
||||
)
|
||||
|
||||
find_path(ILCLIENT_LIB_DIR
|
||||
libilclient.a
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
src/hello_pi/libs/ilclient
|
||||
libilclient.a
|
||||
PATHS
|
||||
${OMX_DIR}
|
||||
PATH_SUFFIXES
|
||||
src/hello_pi/libs/ilclient
|
||||
)
|
||||
|
||||
if (BCM_HOST_INCLUDE_DIR AND ILCLIENT_INCLUDE_DIR AND BCM_HOST_LIB_DIR AND ILCLIENT_LIB_DIR)
|
||||
set(libomx_FOUND TRUE)
|
||||
set(libomx_FOUND TRUE)
|
||||
endif()
|
||||
|
||||
if (libomx_FOUND)
|
||||
if (NOT libomx_FIND_QUIETLY)
|
||||
message(STATUS "Found omx:")
|
||||
message(STATUS " - Bcm Host: ${BCM_HOST_INCLUDE_DIR}")
|
||||
message(STATUS " - ilclient: ${ILCLIENT_INCLUDE_DIR}")
|
||||
endif()
|
||||
if (NOT libomx_FIND_QUIETLY)
|
||||
message(STATUS "Found omx:")
|
||||
message(STATUS " - Bcm Host: ${BCM_HOST_INCLUDE_DIR}")
|
||||
message(STATUS " - ilclient: ${ILCLIENT_INCLUDE_DIR}")
|
||||
endif()
|
||||
|
||||
add_library(omx INTERFACE)
|
||||
add_library(omx INTERFACE)
|
||||
|
||||
target_include_directories(omx SYSTEM INTERFACE
|
||||
${BCM_HOST_INCLUDE_DIR}
|
||||
${ILCLIENT_INCLUDE_DIR}
|
||||
)
|
||||
target_include_directories(omx SYSTEM INTERFACE
|
||||
${BCM_HOST_INCLUDE_DIR}
|
||||
${ILCLIENT_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
target_link_libraries(omx INTERFACE
|
||||
${BCM_HOST_LIB_DIR}/libbcm_host.so
|
||||
${ILCLIENT_LIB_DIR}/libilclient.a
|
||||
${BCM_HOST_LIB_DIR}/libvcos.so
|
||||
${BCM_HOST_LIB_DIR}/libvcilcs.a
|
||||
${BCM_HOST_LIB_DIR}/libvchiq_arm.so
|
||||
)
|
||||
target_link_libraries(omx INTERFACE
|
||||
${BCM_HOST_LIB_DIR}/libbcm_host.so
|
||||
${ILCLIENT_LIB_DIR}/libilclient.a
|
||||
${BCM_HOST_LIB_DIR}/libvcos.so
|
||||
${BCM_HOST_LIB_DIR}/libvcilcs.a
|
||||
${BCM_HOST_LIB_DIR}/libvchiq_arm.so
|
||||
)
|
||||
|
||||
target_compile_definitions(omx INTERFACE
|
||||
-DUSE_OMX
|
||||
-DOMX_SKIP64BIT
|
||||
-DRASPBERRYPI3
|
||||
)
|
||||
target_compile_definitions(omx INTERFACE
|
||||
-DUSE_OMX
|
||||
-DOMX_SKIP64BIT
|
||||
-DRASPBERRYPI3
|
||||
)
|
||||
|
||||
endif()
|
||||
|
@ -49,14 +49,14 @@ if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
|
||||
else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
|
||||
find_path(LIBUSB_1_INCLUDE_DIR
|
||||
NAMES
|
||||
libusb.h
|
||||
libusb.h
|
||||
PATHS
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/opt/local/include
|
||||
/sw/include
|
||||
PATH_SUFFIXES
|
||||
libusb-1.0
|
||||
PATH_SUFFIXES
|
||||
libusb-1.0
|
||||
)
|
||||
|
||||
find_library(LIBUSB_1_LIBRARY
|
||||
|
@ -28,8 +28,8 @@ else (RTAUDIO_LIBRARIES AND RTAUDIO_INCLUDE_DIRS)
|
||||
/usr/local/include
|
||||
/opt/local/include
|
||||
/sw/include
|
||||
PATH_SUFFIXES
|
||||
rtaudio
|
||||
PATH_SUFFIXES
|
||||
rtaudio
|
||||
)
|
||||
|
||||
find_library(RTAUDIO_LIBRARY
|
||||
|
@ -1,15 +1,15 @@
|
||||
|
||||
function( findRpiRevision OUTPUT )
|
||||
# Find it with an automated script
|
||||
execute_process( COMMAND grep -Po "^Revision\\s*:\\s*\\K[[:xdigit:]]+" /proc/cpuinfo OUTPUT_VARIABLE TMP )
|
||||
# Find it with an automated script
|
||||
execute_process( COMMAND grep -Po "^Revision\\s*:\\s*\\K[[:xdigit:]]+" /proc/cpuinfo OUTPUT_VARIABLE TMP )
|
||||
|
||||
# If have not found the Revision number, use the last version
|
||||
if ( TMP )
|
||||
message( "-- Detecting Raspberry Pi Revision Number: ${TMP}" )
|
||||
else()
|
||||
set( TMP "0006" )
|
||||
message( WARNING "-- Could NOT find Raspberry Pi revision!" )
|
||||
endif()
|
||||
# If have not found the Revision number, use the last version
|
||||
if ( TMP )
|
||||
message( "-- Detecting Raspberry Pi Revision Number: ${TMP}" )
|
||||
else()
|
||||
set( TMP "0006" )
|
||||
message( WARNING "-- Could NOT find Raspberry Pi revision!" )
|
||||
endif()
|
||||
|
||||
set( ${OUTPUT} "${TMP}" PARENT_SCOPE )
|
||||
set( ${OUTPUT} "${TMP}" PARENT_SCOPE )
|
||||
endfunction()
|
||||
|
Loading…
x
Reference in New Issue
Block a user