diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-30 13:32:52 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-30 13:32:52 +0000 |
| commit | f94fa1e464c9e2a87274c991dc6461f7f4c956d8 (patch) | |
| tree | 1b88020a0dece1ae509cf3fb219b7cce487dc198 /host/CMakeLists.txt | |
| parent | 29e88b3478aad89ff76363029395200a8601e667 (diff) | |
| parent | 281307833c8275031bd2469e6aef3f472490749a (diff) | |
| download | uhd-f94fa1e464c9e2a87274c991dc6461f7f4c956d8.tar.gz uhd-f94fa1e464c9e2a87274c991dc6461f7f4c956d8.tar.bz2 uhd-f94fa1e464c9e2a87274c991dc6461f7f4c956d8.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Conflicts:
host/include/uhd/usrp/dboard_id.hpp
host/lib/usrp/usrp2/usrp2_impl.cpp
Diffstat (limited to 'host/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 2f5d03f7d..05d782abe 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -34,8 +34,9 @@ INCLUDE(CPack) #include after setting vars ######################################################################## SET(RUNTIME_DIR bin) SET(LIBRARY_DIR lib) -SET(RESOURCE_DIR share) -SET(HEADER_DIR include) +SET(INCLUDE_DIR include) +SET(PKG_DATA_DIR share/uhd) +MESSAGE(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") ######################################################################## # Local Include Dir @@ -63,10 +64,10 @@ IF(UNIX) ENDIF(UNIX) IF(WIN32) - ADD_DEFINITIONS(-Dnot=! -Dand=&& -Dor=||) #logical operators ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) #minimum version required is windows xp ADD_DEFINITIONS(-DNOMINMAX) #disables stupidity and enables std::min and std::max ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) #avoid warnings from boost::split + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) #avoid warnings from std::getenv ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc ENDIF(WIN32) @@ -74,7 +75,7 @@ ENDIF(WIN32) # Setup Boost ######################################################################## SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42") -FIND_PACKAGE(Boost 1.36 REQUIRED +FIND_PACKAGE(Boost 1.36 REQUIRED COMPONENTS date_time filesystem program_options @@ -126,7 +127,8 @@ INSTALL( ######################################################################## # Add the subdirectories ######################################################################## -ADD_SUBDIRECTORY(apps) +ADD_SUBDIRECTORY(examples) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(lib) ADD_SUBDIRECTORY(test) +ADD_SUBDIRECTORY(utils) |