diff options
| -rw-r--r-- | cmake/Toolchain_clang.cmake | 2 | ||||
| -rw-r--r-- | cmake/package.cmake | 26 |
2 files changed, 16 insertions, 12 deletions
diff --git a/cmake/Toolchain_clang.cmake b/cmake/Toolchain_clang.cmake index 2c6bbbb5..89353570 100644 --- a/cmake/Toolchain_clang.cmake +++ b/cmake/Toolchain_clang.cmake @@ -2,7 +2,7 @@ # http://www.cmake.org/Wiki/CMake_Cross_Compiling#The_toolchain_file # the name of the target operating system -SET(CMAKE_SYSTEM_NAME Clang) +SET(CMAKE_SYSTEM_NAME Generic) # which compilers to use for C and C++ SET(CMAKE_C_COMPILER /usr/bin/clang) diff --git a/cmake/package.cmake b/cmake/package.cmake index a7ebe447..62bf20e1 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -24,6 +24,17 @@ ## process this file with CMake to produce Makefile +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This is GNU Awk ${GAWK_VERSION}") +set(CPACK_PACKAGE_VENDOR "GNU Project - Free Software Foundation (FSF)") +SET(CPACK_PACKAGE_NAME "gawk") +SET(CPACK_PACKAGE_VERSION "${GAWK_VERSION}") +SET(CPACK_PACKAGE_VERSION_MAJOR "${GAWK_MAJOR_VERSION}") +SET(CPACK_PACKAGE_VERSION_MINOR "${GAWK_MINOR_VERSION}") +SET(CPACK_PACKAGE_VERSION_PATCH "${GAWK_BUGFIX_VERSION}") +SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") +SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") +set(CPACK_PACKAGE_CONTACT "bug-gawk@gnu.org") + IF (WIN32) SET(CPACK_GENERATOR "NSIS") set(CPACK_NSIS_INSTALL_ROOT "C:/Programs") @@ -33,18 +44,11 @@ IF (WIN32) set(CPACK_NSIS_CONTACT "bug-gawk@gnu.org") set(CPACK_NSIS_DISPLAY_NAME "GNU Awk") ELSE() - SET(CPACK_GENERATOR "TGZ") SET(CPACK_PACKAGING_INSTALL_PREFIX /usr) + IF(NOT CPACK_GENERATOR) + SET(CPACK_GENERATOR "TGZ") + ENDIF() + message(STATUS "CPACK_GENERATOR set to ${CPACK_GENERATOR}") ENDIF() -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This is GNU Awk ${GAWK_VERSION}") -set(CPACK_PACKAGE_VENDOR "GNU Project - Free Software Foundation (FSF)") -SET(CPACK_PACKAGE_NAME "gawk") -SET(CPACK_PACKAGE_VERSION "${GAWK_VERSION}") -SET(CPACK_PACKAGE_VERSION_MAJOR "${GAWK_MAJOR_VERSION}") -SET(CPACK_PACKAGE_VERSION_MINOR "${GAWK_MINOR_VERSION}") -SET(CPACK_PACKAGE_VERSION_PATCH "${GAWK_BUGFIX_VERSION}") -SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") -SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") - INCLUDE(CPack) |