hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

uhd: time for version minor, path tweaks, notes on windows command line compilation

Browse Source
This commit is contained in:
Josh Blum 2010-07-13 20:27:00 -07:00
parent 3f1d313c9f
commit 1f1651ba46
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/CMakeLists.txt
View File

@ -38,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

14
host/config/CPack.cmake
View File

@ -23,7 +23,7 @@ SET(UHD_VERSION_MINOR 0)
SET(UHD_VERSION_PATCH 0)
########################################################################
# Get the current YYYYMMDD timestamp
# Get the current YYYYMMDD HHMMSS timestamp
########################################################################
EXECUTE_PROCESS(
COMMAND ${PYTHON_EXECUTABLE} -c "import time; print time.strftime('%Y%m%d', time.gmtime())"
@ -31,6 +31,12 @@ EXECUTE_PROCESS(
)
SET(UHD_VERSION_MAJOR ${UHD_DATE})
EXECUTE_PROCESS(
COMMAND ${PYTHON_EXECUTABLE} -c "import time; print time.strftime('%H%M%S', time.gmtime())"
OUTPUT_VARIABLE UHD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE
)
SET(UHD_VERSION_MINOR ${UHD_TIME})
########################################################################
# Find GIT to get repo information
########################################################################
@ -47,7 +53,7 @@ ELSE(${GIT} STREQUAL "GIT-NOTFOUND")
OUTPUT_VARIABLE UHD_REV OUTPUT_STRIP_TRAILING_WHITESPACE
)
ENDIF(${GIT} STREQUAL "GIT-NOTFOUND")
SET(UHD_VERSION_MINOR ${UHD_REV})
SET(UHD_VERSION_PATCH ${UHD_REV})
########################################################################
# Setup CPack
@ -58,8 +64,8 @@ SET(CPACK_PACKAGE_CONTACT "support@ettus.com")
SET(CPACK_PACKAGE_VERSION_MAJOR ${UHD_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${UHD_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${UHD_VERSION_PATCH})
SET(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE)
SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
SET(BOOST_MIN_VERSION 1.36) #used in setup for boost
STRING(REPLACE "," ", " CPACK_DEBIAN_PACKAGE_DEPENDS
"libboost-date-time-dev (>= ${BOOST_MIN_VERSION}),"

6
host/docs/build.rst
View File

@ -148,6 +148,12 @@ Build the project in MSVC
**Note:** you may not have permission to build the install target.
You need to be an administrator or to run MSVC as administrator.
** alternative command line instructions **
* Open the Visual Studio Command Prompt Shorcut
* DevEnv <uhd-repo-path>\host\build\ALL_BUILD.vcproj /Build Release
* DevEnv <uhd-repo-path>\host\build\INSTALL.vcproj /Build Release
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Setup the PATH environment variable
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^