summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-27 15:04:01 -0700
committerJosh Blum <josh@joshknows.com>2011-03-27 15:04:01 -0700
commitc6c4b01e09efc037aa44dbf8cdba1c705747bd2f (patch)
treeafa33efca0ff949882bda43a4deab776a87f5c76
parentd078d4f5d17088b9f366c62f5b3eca7b167e665c (diff)
downloaduhd-release_003_000_000.tar.gz
uhd-release_003_000_000.tar.bz2
uhd-release_003_000_000.zip
uhd: swapped UHD_PACKAGE_MODE with UHD_RELEASE_MODE (boolean)release_003_000_000
-rw-r--r--host/Modules/UHDPackage.cmake4
-rw-r--r--host/Modules/UHDVersion.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake
index 65897ceef..65637ab16 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/Modules/UHDPackage.cmake
@@ -21,7 +21,7 @@ INCLUDE(UHDVersion) #sets version information
########################################################################
# Setup package file name
########################################################################
-IF(UHD_PACKAGE_MODE STREQUAL AUTO)
+IF(UHD_RELEASE_MODE)
FIND_PROGRAM(LSB_RELEASE_EXECUTABLE lsb_release)
FIND_PROGRAM(UNAME_EXECUTABLE uname)
IF(LSB_RELEASE_EXECUTABLE AND UNAME_EXECUTABLE)
@@ -59,7 +59,7 @@ IF(UHD_PACKAGE_MODE STREQUAL AUTO)
SET(CPACK_GENERATOR NSIS)
ENDIF()
-ENDIF(UHD_PACKAGE_MODE STREQUAL AUTO)
+ENDIF(UHD_RELEASE_MODE)
########################################################################
# Setup CPack General
diff --git a/host/Modules/UHDVersion.cmake b/host/Modules/UHDVersion.cmake
index 440ce6698..dbc39b5a9 100644
--- a/host/Modules/UHDVersion.cmake
+++ b/host/Modules/UHDVersion.cmake
@@ -32,7 +32,7 @@ SET(UHD_VERSION_PATCH 000)
########################################################################
# Version information discovery through git log
########################################################################
-IF(UHD_PACKAGE_MODE STREQUAL AUTO)
+IF(UHD_RELEASE_MODE)
SET(UHD_VERSION_DISCOVERY FALSE)
ELSE()
SET(UHD_VERSION_DISCOVERY GIT_FOUND)