# HG changeset patch # User Louis Opter # Date 1269273028 -3600 # Node ID c76d8ce500cbec8164923ba1c7727fdbb0875feb # Parent f744b9c6aba2af0f6752c4e9c77a3b2da1f74c36 Update Readme, Fix in-place install, Fix source package generation diff -r f744b9c6aba2 -r c76d8ce500cb CMakeLists.txt --- a/CMakeLists.txt Mon Mar 22 16:07:05 2010 +0100 +++ b/CMakeLists.txt Mon Mar 22 16:50:28 2010 +0100 @@ -45,9 +45,11 @@ # Install rules ################################################################ INSTALL(DIRECTORY examples - DESTINATION share/doc/ziastreamit + DESTINATION share/doc/streamit COMPONENT Examples PATTERN "CMakeLists.txt" EXCLUDE + PATTERN "CMakeFiles" EXCLUDE + PATTERN "cmake_install.cmake" EXCLUDE REGEX ".*\\.sw.?$" EXCLUDE ) @@ -71,14 +73,15 @@ # CPack stuff ################################################################## -SET(PACKAGE_NAME "ziastreamit") -SET(PACKAGE_FILE_NAME "${PACKAGE_NAME}-build-${STREAMIT_API_VERSION}") -SET(PACKAGE_SOURCE_FILE_NAME "${PACKAGE_NAME}-${STREAMIT_API_VERSION}") +SET(PACKAGE_NAME "StreamIt-${STREAMIT_API_VERSION}") +SET(PACKAGE_FILE_NAME ${PACKAGE_NAME}) +SET(PACKAGE_SOURCE_FILE_NAME "Sources-${PACKAGE_NAME}") SET(CPACK_PACKAGE_EXECUTABLES "rot13" "rot13") # SET(CPACK_PACKAGE_NAME ${PACKAGE_NAME}) SET(CPACK_PACKAGE_FILE_NAME ${PACKAGE_NAME}) SET(CPACK_PACKAGE_DESCRIPTION_FILE "${STREAMIT_API_SOURCE_DIR}/CMakeScripts/CPackDescription.txt") SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_SOURCE_FILE_NAME}) +SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/" "/doc/" ".*\\\\.sw.?$" "\\\\.hgignore") SET(CPACK_COMPONENTS_ALL Examples Includes) SET(CPACK_RESOURCE_FILE_LICENSE "${STREAMIT_API_SOURCE_DIR}/CMakeScripts/CPackLicense.txt") SET(CPACK_RESOURCE_FILE_README "${CPACK_PACKAGE_DESCRIPTION_FILE}") diff -r f744b9c6aba2 -r c76d8ce500cb README --- a/README Mon Mar 22 16:07:05 2010 +0100 +++ b/README Mon Mar 22 16:50:28 2010 +0100 @@ -27,10 +27,10 @@ Install the api headers on your system: --------------------------------------- -This is optional, but if you don't want to bother with include paths and -environment variables this is for you. +This is optional. -Windows: Use the installer. +Windows: Use the installer, then adjust your environ to add a variable which +point to the include dir and use this variable in VS. If you are not on Windows do as in "Build examples" but after make do: @@ -39,7 +39,7 @@ Uninstall the api headers from your system: ------------------------------------------- -Windows: Use the control panel. +Windows: Use the uninstaller. If you are not on Windows do as in "Build examples" but after make do: