sebastian
/
gr-satnogs
mirror of https://gitlab.com/LongHairedHacker/gr-satnogs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update FindJsonCpp.cmake to solve packaging issue

This commit is contained in:
Manolis Surligas 2019-12-12 01:23:04 +02:00
parent 6f13d72769
commit 3339977b81
2 changed files with 292 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/FindJsonCpp.cmake
View File

@ -84,7 +84,7 @@ if(jsoncpp_FOUND)
set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_RELEASE RELEASE RELWITHDEBINFO MINSIZEREL NONE ${_jsoncpp_debug_fallback})
set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELWITHDEBINFO RELEASE MINSIZEREL NONE ${_jsoncpp_debug_fallback})
set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_MINSIZEREL MINSIZEREL RELEASE RELWITHDEBINFO NONE ${_jsoncpp_debug_fallback})
set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_NONE RELEASE RELWITHDEBINFO MINSIZEREL ${_jsoncpp_debug_fallback})
set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_NONE NONE RELEASE RELWITHDEBINFO MINSIZEREL ${_jsoncpp_debug_fallback})
if(NOT MSVC)
set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_DEBUG DEBUG RELWITHDEBINFO RELEASE MINSIZEREL NONE)
endif()

14
debian/patches/0001-remove-git-maint-version.patch vendored
View File

@ -1,10 +1,14 @@
Index: gr-satnogs/CMakeLists.txt
===================================================================
--- gr-satnogs.orig/CMakeLists.txt
+++ gr-satnogs/CMakeLists.txt
@@ -52,4 +52,4 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_
-set(VERSION_INFO_MAINT_VERSION git)
+set(VERSION_INFO_MAINT_VERSION 0)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
set(VERSION_MAJOR 1)
set(VERSION_API 5)
set(VERSION_ABI 1)
-set(VERSION_PATCH git)
+set(VERSION_PATCH 0)
cmake_policy(SET CMP0011 NEW)
########################################################################