changeset 2632:589a953e208d

Merge branch 'fix'
author Vladimir S. FONOV <vladimir.fonov@gmail.com>
date Mon, 12 Mar 2012 16:29:17 -0400
parents bb1acc400036 (current diff) 4cba3cbb796d (diff)
children 356c5bda3c9d 148cf7a20ca4
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 SET(CPACK_GENERATOR TGZ)
 SET(CPACK_PACKAGE_VERSION_MAJOR 2)
 SET(CPACK_PACKAGE_VERSION_MINOR 1)
-SET(CPACK_PACKAGE_VERSION_PATCH 1)
+SET(CPACK_PACKAGE_VERSION_PATCH 10)
 INCLUDE(CPack)
 
 
--- a/progs/CMakeLists.txt
+++ b/progs/CMakeLists.txt
@@ -159,7 +159,6 @@
    mincdiff/mincdiff  
    mincedit/mincedit  
    mincheader/mincheader  
-   mincpik/mincpik  
    mincview/mincview
    PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ  WORLD_EXECUTE WORLD_READ
    DESTINATION bin )
@@ -168,6 +167,10 @@
 configure_file(minchistory/minchistory.in ${CMAKE_CURRENT_BINARY_DIR}/minchistory @ONLY)
 add_custom_target(minchistory chmod +x ${CMAKE_CURRENT_BINARY_DIR}/minchistory DEPENDS minchistory/minchistory.in)
 
+configure_file(mincpik/mincpik.in ${CMAKE_CURRENT_BINARY_DIR}/mincpik @ONLY)
+add_custom_target(mincpik chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mincpik DEPENDS mincpik/mincpik.in)
+
+
 INSTALL(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/minchistory
   PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ  WORLD_EXECUTE WORLD_READ