host: modify the cmake build system, there is a new top dir cmake fil…

…e that builds everything

host/CMakeLists.txt

@@ -0,0 +1,21 @@
+#top dir cmake project for libhackrf + tools
+
+cmake_minimum_required(VERSION 2.8)
+project (hackrf_all)
+
+add_subdirectory(libhackrf)
+add_subdirectory(hackrf-tools)
+
+########################################################################
+# Create uninstall target
+########################################################################
+
+configure_file(
+    ${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+@ONLY)
+
+
+add_custom_target(uninstall
+    ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+)

host/hackrf-tools/CMakeLists.txt

@@ -21,39 +21,43 @@
 
 # Based heavily upon the libftdi cmake setup.
 
+cmake_minimum_required(VERSION 2.8)
 project(hackrf-tools C)
 set(MAJOR_VERSION 0)
 set(MINOR_VERSION 1)
 set(PACKAGE hackrf-tools)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
-
-cmake_minimum_required(VERSION 2.8)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/modules)
 
 if(MSVC)
-include_directories( getopt)
+include_directories(getopt)
 else()
 add_definitions(-Wall)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
 endif()
 
-find_package(USB1 REQUIRED)
-include_directories(${LIBUSB_INCLUDE_DIR})
-
+if(NOT libhackrf_SOURCE_DIR)
 find_package(LIBHACKRF REQUIRED)
 include_directories(${LIBHACKRF_INCLUDE_DIR})
+else()
+include_directories(${libhackrf_SOURCE_DIR}/src)
+endif()
 
 add_subdirectory(src)
 
 ########################################################################
 # Create uninstall target
 ########################################################################
+
+if(NOT hackrf_all_SOURCE_DIR)
 configure_file(
-    ${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake.in
+    ${PROJECT_SOURCE_DIR}/../cmake/cmake_uninstall.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 @ONLY)
 
+
 add_custom_target(uninstall
     ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 )
+endif()

host/hackrf-tools/src/CMakeLists.txt

@@ -50,22 +50,22 @@ install(TARGETS hackrf_cpldjtag RUNTIME DESTINATION ${INSTALL_DEFAULT_BINDIR})
 add_executable(hackrf_info hackrf_info.c)
 install(TARGETS hackrf_info RUNTIME DESTINATION ${INSTALL_DEFAULT_BINDIR})
 
+if(NOT libhackrf_SOURCE_DIR)
 include_directories(${LIBHACKRF_INCLUDE_DIR})
-
-target_link_libraries(hackrf_max2837 ${LIBHACKRF_LIBRARIES})
-target_link_libraries(hackrf_si5351c ${LIBHACKRF_LIBRARIES})
-target_link_libraries(hackrf_transfer ${LIBHACKRF_LIBRARIES})
-target_link_libraries(hackrf_rffc5071 ${LIBHACKRF_LIBRARIES})
-target_link_libraries(hackrf_spiflash ${LIBHACKRF_LIBRARIES})
-target_link_libraries(hackrf_cpldjtag ${LIBHACKRF_LIBRARIES})
-target_link_libraries(hackrf_info ${LIBHACKRF_LIBRARIES})
+LIST(APPEND TOOLS_LINK_LIBS ${LIBHACKRF_LIBRARIES})
+else()
+LIST(APPEND TOOLS_LINK_LIBS hackrf)
+endif()
 
 if(MSVC)
-target_link_libraries(hackrf_max2837  libgetopt_static)
-target_link_libraries(hackrf_si5351c  libgetopt_static)
-target_link_libraries(hackrf_transfer  libgetopt_static)
-target_link_libraries(hackrf_rffc5071  libgetopt_static)
-target_link_libraries(hackrf_spiflash  libgetopt_static)
-target_link_libraries(hackrf_cpldjtag  libgetopt_static)
-target_link_libraries(hackrf_info  libgetopt_static)
+LIST(APPEND TOOLS_LINK_LIBS libgetopt_static)
 endif()
+
+
+target_link_libraries(hackrf_max2837 ${TOOLS_LINK_LIBS})
+target_link_libraries(hackrf_si5351c ${TOOLS_LINK_LIBS})
+target_link_libraries(hackrf_transfer ${TOOLS_LINK_LIBS})
+target_link_libraries(hackrf_rffc5071 ${TOOLS_LINK_LIBS})
+target_link_libraries(hackrf_spiflash ${TOOLS_LINK_LIBS})
+target_link_libraries(hackrf_cpldjtag ${TOOLS_LINK_LIBS})
+target_link_libraries(hackrf_info ${TOOLS_LINK_LIBS})

host/libhackrf/CMakeLists.txt

@@ -21,15 +21,14 @@
 
 # Based heavily upon the libftdi cmake setup.
 
+cmake_minimum_required(VERSION 2.8)
 project(libhackrf C)
 set(MAJOR_VERSION 0)
 set(MINOR_VERSION 1)
 set(PACKAGE libhackrf)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
-
-cmake_minimum_required(VERSION 2.8)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/modules)
 
 if(MSVC)
 set(THREADS_USE_PTHREADS_WIN32 true)
@@ -48,11 +47,13 @@ add_subdirectory(src)
 ########################################################################
 # Create uninstall target
 ########################################################################
+if(NOT hackrf_all_SOURCE_DIR)
 configure_file(
-    ${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake.in
+    ${PROJECT_SOURCE_DIR}/../cmake/cmake_uninstall.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 @ONLY)
 
 add_custom_target(uninstall
     ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 )
+endif()