From a642cf0d41269e4b2b96804d8bae0946089b802c Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Wed, 1 May 2019 18:19:46 +0200 Subject: [PATCH] move apple to custom/ --- CMakeLists.txt | 2 +- {apple => custom/apple}/apple_compat.c | 0 {apple => custom/apple}/apple_compat.h | 0 {apple => custom/apple}/deploy.sh | 0 version.h.in => custom/version.h.in | 0 fcdhid/CMakeLists.txt | 4 ++-- fcdhid/hid-libusb.c | 2 +- qrtplib/CMakeLists.txt | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) rename {apple => custom/apple}/apple_compat.c (100%) rename {apple => custom/apple}/apple_compat.h (100%) rename {apple => custom/apple}/deploy.sh (100%) rename version.h.in => custom/version.h.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 131d0e262..d165cbcff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,7 +182,7 @@ execute_process( add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}") configure_file( - ${CMAKE_SOURCE_DIR}/version.h.in + ${CMAKE_SOURCE_DIR}/custom/version.h.in ${CMAKE_BINARY_DIR}/generated/sdrangel_version.h ) diff --git a/apple/apple_compat.c b/custom/apple/apple_compat.c similarity index 100% rename from apple/apple_compat.c rename to custom/apple/apple_compat.c diff --git a/apple/apple_compat.h b/custom/apple/apple_compat.h similarity index 100% rename from apple/apple_compat.h rename to custom/apple/apple_compat.h diff --git a/apple/deploy.sh b/custom/apple/deploy.sh similarity index 100% rename from apple/deploy.sh rename to custom/apple/deploy.sh diff --git a/version.h.in b/custom/version.h.in similarity index 100% rename from version.h.in rename to custom/version.h.in diff --git a/fcdhid/CMakeLists.txt b/fcdhid/CMakeLists.txt index b46eaedc9..dbd80ccb5 100644 --- a/fcdhid/CMakeLists.txt +++ b/fcdhid/CMakeLists.txt @@ -1,13 +1,13 @@ project(fcdhid) set(fcdhid_SOURCES - ../apple/apple_compat.c + ../custom/apple/apple_compat.c hid-libusb.c fcdhid.c ) set(fcdhid_HEADERS - ../apple/apple_compat.h + ../custom/apple/apple_compat.h fcdhid.h hid-libusb.h hidapi.h diff --git a/fcdhid/hid-libusb.c b/fcdhid/hid-libusb.c index 168eaeffe..4addfd553 100644 --- a/fcdhid/hid-libusb.c +++ b/fcdhid/hid-libusb.c @@ -70,7 +70,7 @@ extern "C" { */ #ifdef __APPLE__ -#include "../apple/apple_compat.h" +#include "../custom/apple/apple_compat.h" #endif diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt index 941fe9927..e3a2e2dfa 100644 --- a/qrtplib/CMakeLists.txt +++ b/qrtplib/CMakeLists.txt @@ -1,7 +1,7 @@ project(qrtplib) set (qrtplib_HEADERS - ../apple/apple_compat.h + ../custom/apple/apple_compat.h rtcpapppacket.h rtcpbyepacket.h rtcpcompoundpacket.h @@ -44,7 +44,7 @@ set (qrtplib_HEADERS ) set(qrtplib_SOURCES - ../apple/apple_compat.c + ../custom/apple/apple_compat.c rtcpapppacket.cpp rtcpbyepacket.cpp rtcpcompoundpacket.cpp