From edbe6fc72eff3f117bbc4e6a5134301e8ceca25f Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 24 Jun 2014 11:13:28 +0200 Subject: [PATCH] Fixes #1316 --- companion/src/CMakeLists.txt | 10 ---------- companion/src/firmwares/opentx/stamp-opentx.h.in | 1 - 2 files changed, 11 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index d9073fa10..4e661dbf6 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -87,13 +87,6 @@ add_custom_command( WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} ) -add_custom_command( - OUTPUT ${RADIO_SRC_DIRECTORY}/stamp-opentx.h - COMMAND make stamp_header - DEPENDS ${RADIO_SRC_DIRECTORY}/Makefile - WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} -) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../.. @@ -142,7 +135,6 @@ set(companion_SRCS flashinterface.cpp # xmlinterface.cpp # ${PROJECT_BINARY_DIR}/radio.cxx - ${RADIO_SRC_DIRECTORY}/stamp-opentx.h helpers.cpp mdichild.cpp generaledit.cpp @@ -250,8 +242,6 @@ NOW(TIME) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY) - -# Subversion_WC_INFO( ${PROJECT_SOURCE_DIR}/../${FIRMWARE} G9X ) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${CMAKE_CURRENT_BINARY_DIR}/stamp-opentx.h @ONLY) IF( WIN32 ) diff --git a/companion/src/firmwares/opentx/stamp-opentx.h.in b/companion/src/firmwares/opentx/stamp-opentx.h.in index 1b56589f5..64cb64097 100644 --- a/companion/src/firmwares/opentx/stamp-opentx.h.in +++ b/companion/src/firmwares/opentx/stamp-opentx.h.in @@ -2,4 +2,3 @@ #define DATE_STR "@DATE@" #define TIME_STR "@TIME@" #define VERS_STR "@C9X_VERSION@" -#define MOD_STR "FH"