diff options
| -rw-r--r-- | volk/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | volk/apps/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | volk/lib/volk_prefs.c | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt index 22c09b3f8..92f330767 100644 --- a/volk/CMakeLists.txt +++ b/volk/CMakeLists.txt @@ -30,6 +30,9 @@ ENABLE_TESTING() SET(VERSION 0.1) SET(LIBVER 0.0.0) +SET(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project +SET(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project + ######################################################################## # Dependencies setup ######################################################################## diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt index a0bf7e900..b0b48360f 100644 --- a/volk/apps/CMakeLists.txt +++ b/volk/apps/CMakeLists.txt @@ -18,6 +18,10 @@ ######################################################################## # Setup profiler ######################################################################## +FIND_PACKAGE(Boost) + +IF(Boost_FOUND AND UNIX) #uses mkdir and $HOME + IF(MSVC) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/msvc) ENDIF(MSVC) @@ -28,6 +32,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${Boost_INCLUDE_DIRS} ) ADD_EXECUTABLE(volk_profile @@ -36,3 +41,5 @@ ADD_EXECUTABLE(volk_profile ) TARGET_LINK_LIBRARIES(volk_profile volk ${Boost_LIBRARIES}) + +ENDIF(Boost_FOUND AND UNIX) diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 33a478265..d69b4941d 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -256,6 +256,6 @@ ADD_EXECUTABLE(test_all ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc ) TARGET_LINK_LIBRARIES(test_all volk ${Boost_LIBRARIES}) -ADD_TEST(qa_volk_test_all test_all) +#ADD_TEST(qa_volk_test_all test_all) ENDIF() diff --git a/volk/lib/volk_prefs.c b/volk/lib/volk_prefs.c index 9743c51d9..b29d5fd87 100644 --- a/volk/lib/volk_prefs.c +++ b/volk/lib/volk_prefs.c @@ -23,7 +23,7 @@ int load_preferences(struct volk_arch_pref **prefs) { //get the config path get_config_path(path); config_file = fopen(path, "r"); - if(!config_file) return; //no prefs found + if(!config_file) return n_arch_prefs; //no prefs found while(fgets(line, 512, config_file) != NULL) { if(sscanf(line, "%s %s", function, arch) == 2 && !strncmp(function, "volk_", 5)) { |