diff options
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
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) diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index 676a98c41e..8cffd7a010 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -89,7 +89,7 @@ ENDMACRO(GR_PYTHON_CHECK_MODULE) ######################################################################## EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " from distutils import sysconfig -print sysconfig.get_python_lib(prefix='') +print sysconfig.get_python_lib(plat_specific=True, prefix='') " OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ) FILE(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR) |