Using CMake build environment from now on

msoos · Dec 26, 2011 · 1659e26 · 1659e26
1 parent fb88302
commit 1659e26
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 118 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,3 +35,14 @@ add_custom_command(
 )
 
 add_dependencies(copy espresso_exec grainofsalt)
+
+set(CPACK_PACKAGE_NAME "grainofsalt")
+set(CPACK_PACKAGE_VENDOR "www.msoos.org")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A stream cipher tester")
+set(CPACK_PACKAGE_VERSION "1.2.1")
+set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "2")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_GENERATOR TGZ)
+include(CPack)
+
diff --git a/INSTALL b/INSTALL
@@ -1,13 +1,13 @@
-To compile, issue:
+To compile, you will need 'cmake'. Once installed, issue:
 
 $ cd build
-$ ../configure
+$ cmake ../
 $ make
 
 Please do NOT try to skip the "cd build". Your build will succeed, but
 it will not be useable.
 
-To use, issue, from directory 'build':
+To use, issue from directory 'build':
 
 $ ./grainofsalt --num 100 --outputs 90 --crypto grain
 
diff --git a/Makefile.am b/Makefile.am
diff --git a/Makefile.cvs b/Makefile.cvs
diff --git a/configure.in b/configure.in
diff --git a/espresso/main/Makefile.am b/espresso/main/Makefile.am
diff --git a/espresso/mincov/Makefile.am b/espresso/mincov/Makefile.am
diff --git a/espresso/sparse/Makefile.am b/espresso/sparse/Makefile.am
diff --git a/espresso/util/Makefile.am b/espresso/util/Makefile.am
diff --git a/generator/Makefile.am b/generator/Makefile.am