From 766cbf8d45f200ebd7d6a89e220a7a36f490de5c Mon Sep 17 00:00:00 2001 From: andres Date: Sat, 1 Nov 2014 03:14:34 +0100 Subject: [PATCH] Allow compiling in linux, GCC... --- src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt | 10 +++------- .../volk_gnsssdr/lib/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt index 86bb4550e..59865248b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/CMakeLists.txt @@ -25,21 +25,18 @@ message(STATUS " START OF: Setup volk_gnsssdr as a subproject.") -set(VOLK_GNSSSDR_BASE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr) - -set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/lib) list(APPEND CMAKE_C_FLAGS "-std=c11") +set (CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/install" CACHE PATH "Install prefix for volk_gnsssdr" FORCE ) -add_subdirectory(${VOLK_GNSSSDR_BASE_PATH}) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr) set(VOLK_GNSSSDR_INCLUDE_DIRS - ${VOLK_GNSSSDR_BASE_PATH}/include + ${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr/include ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr/include CACHE INTERNAL "" ) set(VOLK_GNSSSDR_LIBRARIES - #Path to libs of volk_gnsssdr target: ${VOLK_GNSSSDR_BASE_PATH}/lib/Debug/libvolk_gnsssdr.dylib volk_gnsssdr CACHE INTERNAL "" ) @@ -47,4 +44,3 @@ set(VOLK_GNSSSDR_LIBRARIES message(STATUS " * INCLUDES: ${VOLK_GNSSSDR_INCLUDE_DIRS} ") message(STATUS " * LIBS: ${VOLK_GNSSSDR_LIBRARIES} ") message(STATUS " END OF: Setup volk_gnsssdr as a subproject.") - diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt index 04cb9ee05..7f02b7fa6 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt @@ -523,7 +523,7 @@ file(GLOB orc ${CMAKE_SOURCE_DIR}/orc/*.orc) file(GLOB CommonMacros ${CMAKE_SOURCE_DIR}/kernels/CommonMacros/*.h ${CMAKE_SOURCE_DIR}/kernels/CommonMacros/README.txt) #add_library(volk_gnsssdr SHARED ${volk_gnsssdr_sources}) -add_library(volk_gnsssdr SHARED ${volk_gnsssdr_sources} ${h_files} ${CommonMacros} ${orc}) +add_library(volk_gnsssdr STATIC ${volk_gnsssdr_sources} ${h_files} ${CommonMacros} ${orc}) source_group("Kernels" FILES ${h_files}) source_group("Common Macros" FILES ${CommonMacros})