diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-13 20:27:00 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-13 20:27:00 -0700 |
| commit | 1f1651ba46e55017bf598f0824b62be5ae2c5fd8 (patch) | |
| tree | 097f8b55bd207fdee3c4c1f8149d15914658135a | |
| parent | 3f1d313c9ffd30c70c609748696b746633e47a8a (diff) | |
| download | uhd-1f1651ba46e55017bf598f0824b62be5ae2c5fd8.tar.gz uhd-1f1651ba46e55017bf598f0824b62be5ae2c5fd8.tar.bz2 uhd-1f1651ba46e55017bf598f0824b62be5ae2c5fd8.zip | |
uhd: time for version minor, path tweaks, notes on windows command line compilation
| -rw-r--r-- | host/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/config/CPack.cmake | 14 | ||||
| -rw-r--r-- | host/docs/build.rst | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 8ae651eca..086e63a2f 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -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 diff --git a/host/config/CPack.cmake b/host/config/CPack.cmake index a73a00923..ed4aeb717 100644 --- a/host/config/CPack.cmake +++ b/host/config/CPack.cmake @@ -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})," diff --git a/host/docs/build.rst b/host/docs/build.rst index 108d8dc8b..5944a6ebe 100644 --- a/host/docs/build.rst +++ b/host/docs/build.rst @@ -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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |