diff options
| author | Philip Balister <philip@opensdr.com> | 2010-10-21 14:11:29 -0400 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-10-21 14:11:29 -0400 |
| commit | 090b0dd0d38f23cd1d7c4c6a7b0317a6fdfe2b9b (patch) | |
| tree | ec8a6f261a7a722c6842e1d90fa976905b7ead09 /host/CMakeLists.txt | |
| parent | c830a0d2c491fb61c2b401db94ed0a147bca4a24 (diff) | |
| parent | c347ad973f4b51b00f66d7422cd03e8790de9be3 (diff) | |
| download | uhd-090b0dd0d38f23cd1d7c4c6a7b0317a6fdfe2b9b.tar.gz uhd-090b0dd0d38f23cd1d7c4c6a7b0317a6fdfe2b9b.tar.bz2 uhd-090b0dd0d38f23cd1d7c4c6a7b0317a6fdfe2b9b.zip | |
Merge branch 'usrp_e_mmap_b2' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 78948d9bd..e5ce78782 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -30,7 +30,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/config/CPack.cmake) # Install Dirs ######################################################################## SET(RUNTIME_DIR bin) -SET(LIBRARY_DIR lib) +SET(LIBRARY_DIR lib${LIB_SUFFIX}) SET(INCLUDE_DIR include) SET(PKG_DATA_DIR share/uhd) SET(PKG_DOC_DIR share/doc/uhd) @@ -61,6 +61,10 @@ ENDIF(NOT CMAKE_BUILD_TYPE) IF(CMAKE_COMPILER_IS_GNUCXX) ADD_DEFINITIONS(-Wall) ADD_DEFINITIONS(-Wextra) + #causes trouble when compiling libusb1.0 on macintosh + #comment out until mac ports libusb gets its act together + #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) @@ -80,7 +84,7 @@ IF(UNIX AND EXISTS "/usr/lib64") LIST(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix ENDIF(UNIX AND EXISTS "/usr/lib64") -SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42" "1.43.0" "1.43") +SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44") FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS date_time filesystem |