diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-16 18:29:16 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-16 18:29:16 -0700 |
| commit | ef0ca3b183c8526d5895ba918abffc9624bb2290 (patch) | |
| tree | 8721d291dffc9dda04374378b47e931119fa4b0b /host/CMakeLists.txt | |
| parent | e1e3ed670ae4a2f8a4157977631ae8eed88f55b8 (diff) | |
| parent | 1f1651ba46e55017bf598f0824b62be5ae2c5fd8 (diff) | |
| download | uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.tar.gz uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.tar.bz2 uhd-ef0ca3b183c8526d5895ba918abffc9624bb2290.zip | |
Merge branch 'package'
Also tweaked pkg config file
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 45e18993e..8e28ddb34 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -20,14 +20,10 @@ PROJECT(UHD CXX) ENABLE_TESTING() ######################################################################## -# Setup CPack +# Config Files ######################################################################## -SET(CPACK_PACKAGE_VERSION_MAJOR 0) -SET(CPACK_PACKAGE_VERSION_MINOR 0) -SET(CPACK_PACKAGE_VERSION_PATCH 0) -SET(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README) -SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE) -INCLUDE(CPack) #include after setting vars +INCLUDE(${CMAKE_SOURCE_DIR}/config/Python.cmake) +INCLUDE(${CMAKE_SOURCE_DIR}/config/CPack.cmake) ######################################################################## # Install Dirs @@ -42,7 +38,7 @@ MESSAGE(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") ######################################################################## # Local Include Dir ######################################################################## -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ######################################################################## # Optional Compiler Flags @@ -62,10 +58,10 @@ IF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE) IF(CMAKE_COMPILER_IS_GNUCXX) - UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-Wall HAVE_WALL) - UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-Wextra HAVE_WEXTRA) - UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-pedantic HAVE_PEDANTIC) - UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-ansi HAVE_ANSI) + ADD_DEFINITIONS(-Wall) + ADD_DEFINITIONS(-Wextra) + ADD_DEFINITIONS(-pedantic) + ADD_DEFINITIONS(-ansi) #only export symbols that are declared to be part of the uhd api: UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN) ENDIF(CMAKE_COMPILER_IS_GNUCXX) @@ -86,7 +82,7 @@ IF(UNIX AND EXISTS "/usr/lib64") ENDIF(UNIX AND EXISTS "/usr/lib64") SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42" "1.43.0" "1.43") -FIND_PACKAGE(Boost 1.36 REQUIRED COMPONENTS +FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS date_time filesystem program_options @@ -103,7 +99,7 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) # Create Uninstall Target ######################################################################## CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in + ${CMAKE_SOURCE_DIR}/config/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake @ONLY) |