From a5f68dfeb893d3eae51bb27ebe1f36c63d20eecd Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Mon, 16 Sep 2013 01:17:38 -0400 Subject: [PATCH] host: All build output is placed in a single directory All executables and libraries are now placed in a single "output" directory. For Windows builds, third-party DLLs are copied into this directory. This commit also moves some CFLAGS changes in the top-level CMakeLists.txt down to where some other compiler flags are set up. (Non-functional change) --- host/CMakeLists.txt | 59 ++++++++++++++++++--- host/libraries/libbladeRF/CMakeLists.txt | 7 --- host/utilities/bladeRF-cli/CMakeLists.txt | 17 +----- host/utilities/bladeRF-flash/CMakeLists.txt | 11 ---- 4 files changed, 52 insertions(+), 42 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 3352f1d1..d55c2ac3 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -15,18 +15,16 @@ project(bladeRF C) # Project configuration ################################################################################ +# All build output lands in this directory: +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output) + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") message(STATUS "Build type not specified: defaulting to a release build.") endif() -if(MSVC) - # Cannot enable /WX on Windows build just yet, lots of warnings - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") -else(MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror") -endif(MSVC) - set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Build type") list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules) @@ -95,6 +93,7 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR # TODO Re-enable these # add_definitions(-pedantic) # add_definitions(-std=c89) + add_definitions(-Werror) add_definitions(-Wno-unused-parameter) if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") @@ -106,8 +105,16 @@ endif("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") ############################### -# System configuration +# MS Visual Studio ############################### +if(MSVC) + # Cannot enable /WX on Windows build just yet, lots of warnings + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +endif(MSVC) + +################################################################################ +# System configuration +################################################################################ # Linux (TODO determine if this will actually be sufficient for BSD) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") @@ -152,3 +159,39 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake ) + +################################################################################ +# Windows-only, Post build: Copy libraries to our build output directory +################################################################################ +if(WIN32) + find_package(LibPThreadsWin32) + if(LIBPTHREADSWIN32_FOUND) + set(WIN_POSTBUILD_ITEMS ${WIN_POSTBUILD_ITEMS} + "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/pthreadVC2.dll") + + add_custom_command( + OUTPUT "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/pthreadVC2.dll" + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${LIBPTHREADSWIN32_PATH}/dll/${LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX}/pthreadVC2.dll" + "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" + COMMENT "Copying pthreadVC2.dll to output directory..." + ) + endif(LIBPTHREADSWIN32_FOUND) + + find_package(LibUsb) + if(LIBUSB_FOUND) + set(WIN_POSTBUILD_ITEMS ${WIN_POSTBUILD_ITEMS} + "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libusb-1.0.dll") + + add_custom_command( + OUTPUT "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libusb-1.0.dll" + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${LIBUSB_PATH}/${LIBUSB_LIBRARY_PATH_SUFFIX}/libusb-1.0.dll" + "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" + COMMENT "Copying libusb-1.0.dll to output directory..." + ) + endif(LIBUSB_FOUND) + + add_custom_target(win_postbuild ALL DEPENDS ${WIN_POSTBUILD_ITEMS}) + +endif(WIN32) diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 0d41fafe..1591f959 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -256,10 +256,3 @@ add_custom_target(doc ) endif(DOXYGEN_FOUND) - -if(MSVC) - add_custom_command(TARGET libbladerf_shared POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${LIBUSB_PATH}/${LIBUSB_LIBRARY_PATH_SUFFIX}/libusb-1.0.dll" - "${CMAKE_BINARY_DIR}/libraries/libbladeRF/$(Configuration)/") -endif(MSVC) diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index 77144b68..b6eba68f 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -68,7 +68,7 @@ if(ENABLE_LIBTECLA) endif() if(MSVC) - set(CLI_INCLUDE_DIRS ${CLI_INCLUDE_DIRS} + set(CLI_INCLUDE_DIRS ${CLI_INCLUDE_DIRS} ${BLADERF_HOST_COMMON_INCLUDE_DIRS}/windows ${LIBPTHREADSWIN32_INCLUDE_DIRS} ) @@ -152,21 +152,6 @@ endif() install(TARGETS bladeRF-cli DESTINATION ${BIN_INSTALL_DIR}) -if(MSVC) - add_custom_command(TARGET bladeRF-cli POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${LIBPTHREADSWIN32_PATH}/dll/${LIBPTHREADSWIN32_LIBRARY_PATH_SUFFIX}/pthreadVC2.dll" - "${CMAKE_BINARY_DIR}/utilities/bladeRF-cli/$(Configuration)/") - add_custom_command(TARGET bladeRF-cli POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/libraries/libbladeRF/$(Configuration)/libusb-1.0.dll" - "${CMAKE_BINARY_DIR}/utilities/bladeRF-cli/$(Configuration)/") - add_custom_command(TARGET bladeRF-cli POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/libraries/libbladeRF/$(Configuration)/bladeRF.dll" - "${CMAKE_BINARY_DIR}/utilities/bladeRF-cli/$(Configuration)/") -endif(MSVC) - ################################################################################ # Informational output ################################################################################ diff --git a/host/utilities/bladeRF-flash/CMakeLists.txt b/host/utilities/bladeRF-flash/CMakeLists.txt index fee0c61c..73d16b47 100644 --- a/host/utilities/bladeRF-flash/CMakeLists.txt +++ b/host/utilities/bladeRF-flash/CMakeLists.txt @@ -89,17 +89,6 @@ endif() install(TARGETS bladeRF-flash DESTINATION ${BIN_INSTALL_DIR}) -if(MSVC) - add_custom_command(TARGET bladeRF-flash POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/libraries/libbladeRF/$(Configuration)/libusb-1.0.dll" - "${CMAKE_BINARY_DIR}/utilities/bladeRF-flash/$(Configuration)/") - add_custom_command(TARGET bladeRF-flash POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/libraries/libbladeRF/$(Configuration)/bladeRF.dll" - "${CMAKE_BINARY_DIR}/utilities/bladeRF-flash/$(Configuration)/") -endif(MSVC) - ################################################################################ # Informational output ################################################################################