mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-23 13:33:15 +00:00
Code Issues Releases Wiki Activity

Changing building system: 'cmake && make && sudo make install'

Browse Source
This commit is contained in:
Carles Fernandez 2014-11-04 21:28:01 +01:00
parent 3f4afcb756
commit 74cb7ff362
4 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/algorithms/signal_source/adapters/file_signal_source.cc
View File

@ -31,6 +31,10 @@
*/
#include "file_signal_source.h"
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
#include <cstdlib>
#include <iostream>
#include <fstream>
#include <iomanip>
@ -52,9 +56,18 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
boost::shared_ptr<gr::msg_queue> queue) :
role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
{
std::string default_filename = "../data/my_capture.dat";
char* userHomePath;
userHomePath = getenv ("HOME");
if (userHomePath == NULL)
{
struct passwd *pw = getpwuid(getuid());
userHomePath = pw->pw_dir;
}
std::string hmpath(userHomePath);
std::string default_filename = hmpath + "/.gnss-sdr/data/my_capture.dat";
std::string default_item_type = "short";
std::string default_dump_filename = "../data/my_capture_dump.dat";
std::string default_dump_filename = hmpath + "/.gnss-sdr/data/my_capture.dat";
samples_ = configuration->property(role + ".samples", 0);
sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
@ -100,19 +113,33 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
}
catch (const std::exception &e)
{
std::string default_conf_file;
std::string text_;
if (filename_.compare(default_filename) == 0)
{
default_conf_file = hmpath + "/.gnss-sdr/" + GNSS_SDR_VERSION + "/conf/gnss-sdr.conf";
text_ = "Please modify the configuration example at " + default_conf_file;
}
else
{
default_conf_file = "conf/gnss-sdr.conf";
text_ = "Please modify the configuration at " +
default_conf_file +" (the default configuration file)";
}
std::cerr
<< "The receiver was configured to work with a file signal source "
<< std::endl
<< "but the specified file is unreachable by GNSS-SDR."
<< std::endl
<< "Please modify the configuration at "
<< "conf/gnss-sdr.conf (the default configuration file)"
<< text_
<< std::endl
<< "and point SignalSource.filename to a valid file,"
<< std::endl
<< "or specify your own receiver and source with the flag"
<< std::endl
<<"gnss-sdr --config_file=my_GNSS_SDR_configuration.conf"
<<"gnss-sdr --config_file=/path/to/my_GNSS_SDR_configuration.conf"
<< std::endl;
LOG(INFO) << "file_signal_source: Unable to open the samples file "
<< filename_.c_str() << ", exiting the program.";

13
src/main/CMakeLists.txt
View File

@ -51,8 +51,13 @@ if(OS_IS_MACOSX)
endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif(OS_IS_MACOSX)
add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
add_custom_command(TARGET gnss-sdr POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>)
target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
@ -70,8 +75,12 @@ target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
install(TARGETS gnss-sdr
DESTINATION ${CMAKE_SOURCE_DIR}/install
RUNTIME DESTINATION bin
COMPONENT "gnss-sdr"
)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION $ENV{HOME}/.gnss-sdr
FILES_MATCHING PATTERN "*.conf"
)
install(DIRECTORY DESTINATION $ENV{HOME}/.gnss-sdr/data/)

8
src/tests/CMakeLists.txt
View File

@ -151,6 +151,10 @@ add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/src/tests/")
add_executable(run_tests ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc)
add_custom_command(TARGET run_tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:run_tests>
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:run_tests>)
target_link_libraries(run_tests ${CLANG_FLAGS}
${Boost_LIBRARIES}
${GFLAGS_LIBS}
@ -171,12 +175,11 @@ target_link_libraries(run_tests ${CLANG_FLAGS}
${GNSS_SDR_TEST_OPTIONAL_LIBS}
)
install(TARGETS run_tests DESTINATION ${CMAKE_SOURCE_DIR}/install)
#########################################################
# Adding Tests to Ctest
#########################################################
# ToDo
#set(CMAKE_CTEST_COMMAND ctest -V)
#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
@ -185,6 +188,7 @@ add_executable(control_thread_test EXCLUDE_FROM_ALL
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/control_thread/control_message_factory_test.cc
)
target_link_libraries(control_thread_test ${Boost_LIBRARIES}
${GFLAGS_LIBS}
${GLOG_LIBRARIES}

8
src/utils/front-end-cal/CMakeLists.txt
View File

@ -56,6 +56,11 @@ if(ENABLE_RTLSDR)
add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
add_custom_command(TARGET front-end-cal POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:front-end-cal>
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:front-end-cal>)
target_link_libraries(front-end-cal ${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
@ -69,7 +74,8 @@ if(ENABLE_RTLSDR)
)
install(TARGETS front-end-cal
DESTINATION ${CMAKE_SOURCE_DIR}/install
RUNTIME DESTINATION bin
COMPONENT "front-end-cal"
)
endif(ENABLE_RTLSDR)