X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=tools%2FCMakeLists.txt;h=13262d695de8597a11e49747474d32453eeaa510;hp=51d71fa390c2f282b4cfec57905273bb1b40fabd;hb=efcfa1b51adfbfb0ea7885d0c8862a56cf36d2ac;hpb=e72388a0aa23da8bc8e24a0cbe9d523c5a9ce294 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 51d71fa..13262d6 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -8,31 +8,8 @@ endif (CONFIG_CARL9170FW_MAKE_RELEASE) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/extra) -include(GCCVersion) include("../config.cmake") -_COMPILER_DUMPVERSION(_COMPILER_VERSION) - -if (("${_COMPILER_VERSION}" VERSION_GREATER 44) OR - ("${_COMPILER_VERSION}" VERSION_EQUAL 44)) - - include_directories (../include/linux ../include/shared ../include lib include) - add_subdirectory(lib) - add_subdirectory(src) - - if (CONFIG_CARL9170FW_BUILD_TOOLS_CARLU) - find_package(SDL QUIET) - find_package(USB-1.0 QUIET) - - if ("${USB-1.0_FOUND}" AND "${SDL_FOUND}") - add_subdirectory(carlu) - else() - if ("${USB-1.0_FOUND}") - MESSAGE(ERROR "LibUSB not found\n") - endif ("${USB-1.0_FOUND}") - if ("${SDL_FOUND}") - MESSAGE(ERROR "SDL not found\n") - endif ("${SDL_FOUND}") - endif () - endif (CONFIG_CARL9170FW_BUILD_TOOLS_CARLU) -endif () +include_directories (../include/linux ../include/shared ../include lib include) +add_subdirectory(lib) +add_subdirectory(src)