mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-10 04:03:02 +00:00
Code Issues Releases Wiki Activity

Some minor fixes for packaging

Browse Source 
See https://github.com/gnuradio/volk/pull/100
This commit is contained in:
Carles Fernandez
2016-10-16 08:13:18 +02:00
parent c5c4dd17e5
commit a30bf16abf
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/constants.h
View File

@@ -28,11 +28,11 @@
__VOLK_DECL_BEGIN __VOLK_DECL_BEGIN
VOLK_API char* volk_gnsssdr_prefix(); VOLK_API const char* volk_gnsssdr_prefix();
VOLK_API char* volk_gnsssdr_version(); VOLK_API const char* volk_gnsssdr_version();
VOLK_API char* volk_gnsssdr_c_compiler(); VOLK_API const char* volk_gnsssdr_c_compiler();
VOLK_API char* volk_gnsssdr_compiler_flags(); VOLK_API const char* volk_gnsssdr_compiler_flags();
VOLK_API char* volk_gnsssdr_available_machines(); VOLK_API const char* volk_gnsssdr_available_machines();
__VOLK_DECL_END __VOLK_DECL_END

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
View File

@@ -499,7 +499,7 @@ endif()
message(STATUS "Loading version ${VERSION} into constants...") message(STATUS "Loading version ${VERSION} into constants...")
#double escape for windows backslash path separators #double escape for windows backslash path separators
string(REPLACE "\\" "\\\\" prefix ${prefix}) string(REPLACE "\\" "\\\\" prefix "${prefix}")
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/constants.c.in ${CMAKE_CURRENT_SOURCE_DIR}/constants.c.in

13
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/constants.c.in
View File

@@ -21,33 +21,36 @@
#include <config.h> #include <config.h>
#endif #endif
#include <stdlib.h>
#include <volk_gnsssdr/constants.h> #include <volk_gnsssdr/constants.h>
char* const char*
volk_gnsssdr_prefix() volk_gnsssdr_prefix()
{ {
const char *prefix = getenv("VOLK_GNSSSDR_PREFIX");
if (prefix != NULL) return prefix;
return "@prefix@"; return "@prefix@";
} }
char* const char*
volk_gnsssdr_version() volk_gnsssdr_version()
{ {
return "@VERSION@"; return "@VERSION@";
} }
char* const char*
volk_gnsssdr_c_compiler() volk_gnsssdr_c_compiler()
{ {
return "@cmake_c_compiler_version@"; return "@cmake_c_compiler_version@";
} }
char* const char*
volk_gnsssdr_compiler_flags() volk_gnsssdr_compiler_flags()
{ {
return "@COMPILER_INFO@"; return "@COMPILER_INFO@";
} }
char* const char*
volk_gnsssdr_available_machines() volk_gnsssdr_available_machines()
{ {
return "@available_machines@"; return "@available_machines@";