From 609a0cbd99a04824e4e3ad9ca558102146bb9011 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 29 Jul 2011 18:22:26 -0700
Subject: cmake: tweaks + fixes for components/packaging
---
cmake/Modules/GrPackage.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'cmake/Modules')
diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake
index 7647324a07..2fc9fc08af 100644
--- a/cmake/Modules/GrPackage.cmake
+++ b/cmake/Modules/GrPackage.cmake
@@ -46,6 +46,7 @@ ENDIF()
FUNCTION(CPACK_SET var)
SET(${var} ${ARGN} CACHE INTERNAL "")
LIST(APPEND _cpack_vars ${var})
+ LIST(REMOVE_DUPLICATES _cpack_vars)
SET(_cpack_vars ${_cpack_vars} CACHE INTERNAL "")
ENDFUNCTION(CPACK_SET)
@@ -76,9 +77,10 @@ FUNCTION(CPACK_COMPONENT name)
SET(_options GROUP DISPLAY_NAME DESCRIPTION DEPENDS)
CMAKE_PARSE_ARGUMENTS(CPACK_COMPONENT "" "${_options}" "" ${ARGN})
+ STRING(TOUPPER "${name}" name_upper)
FOREACH(_option ${_options})
IF(CPACK_COMPONENT_${_option})
- CPACK_SET(CPACK_COMPONENT_${name}_${_option} "${CPACK_COMPONENT_${_option}}")
+ CPACK_SET(CPACK_COMPONENT_${name_upper}_${_option} "${CPACK_COMPONENT_${_option}}")
ENDIF()
ENDFOREACH(_option)
--
cgit v1.2.3