# HG changeset patch # User Louis Opter # Date 1270846873 -7200 # Node ID 95e639a51bf6d2d7207137308f75c2623a99ef4f # Parent 44b9ac934329e543f036b06cae0d05e549eb3fdc Fix install rules (close #13) diff -r 44b9ac934329 -r 95e639a51bf6 CMakeLists.txt --- a/CMakeLists.txt Fri Apr 09 20:54:53 2010 +0200 +++ b/CMakeLists.txt Fri Apr 09 23:01:13 2010 +0200 @@ -49,10 +49,9 @@ INSTALL(DIRECTORY examples DESTINATION share/doc/streamit COMPONENT Examples - PATTERN "CMakeLists.txt" EXCLUDE - PATTERN "CMakeFiles" EXCLUDE - PATTERN "cmake_install.cmake" EXCLUDE - REGEX ".*\\.sw.?$" EXCLUDE + FILES_MATCHING + REGEX "[hc]pp$" + REGEX "CMakeFiles" EXCLUDE ) # Uninstall rules ############################################################## @@ -77,6 +76,18 @@ # CPack stuff ################################################################## SET(PACKAGE_NAME "StreamIt") +SET(IGNORE_PATTERNS + "/\\\\.hg.*" + "/doc/" + ".*\\\\.sw.?$" + "/CMakeFiles/" + "CMakeCache.txt" + ".*install.*\\\\.(cmake|txt)$" + ".*(Makefile|CTest).*" + ".*${PACKAGE_NAME}[^/]*" + ".*CPack.*([^t][^x][^t])$" + "/Test_.*/" + ) SET(PACKAGE_FILE_NAME "${PACKAGE_NAME}-${STREAMIT_API_VERSION}") SET(PACKAGE_SOURCE_FILE_NAME "Sources-${PACKAGE_NAME}-${STREAMIT_API_VERSION}") SET(CPACK_PACKAGE_EXECUTABLES "rot13" "rot13") # @@ -84,7 +95,7 @@ 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_SOURCE_IGNORE_FILES ${IGNORE_PATTERNS}) 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 44b9ac934329 -r 95e639a51bf6 include/CMakeLists.txt --- a/include/CMakeLists.txt Fri Apr 09 20:54:53 2010 +0200 +++ b/include/CMakeLists.txt Fri Apr 09 23:01:13 2010 +0200 @@ -7,8 +7,8 @@ INSTALL(DIRECTORY ${SUBDIRECTORIES} DESTINATION include/streamit COMPONENT Includes - PATTERN "CMakeLists.txt" EXCLUDE - REGEX ".*\\.sw.?$" EXCLUDE + FILES_MATCHING + REGEX "[hc]pp$" ) SET(HEADERS