From 4a00aec0b9a4990dff756947a224dc0722219fd5 Mon Sep 17 00:00:00 2001
From: tearsofphoenix <tearsofphoenix@icloud.com>
Date: Tue, 30 Jan 2018 09:50:30 +0800
Subject: [PATCH 1/3] add support for CMake

Note that the CMakeLists.txt file is not included in autotools dist package to
avoid any packaging confusion. `configure.ac` is still the primary
build-configuration information source. (Btw isn't there a way to build
CMakeLists.txt from autotools?)
---
 .gitignore     |  2 ++
 CMakeLists.txt | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 CMakeLists.txt

diff --git a/.gitignore b/.gitignore
index cb97670..fc84585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ NEWS
 src/.deps/
 src/.dirstamp
 src/*.o
+.idea
+cmake-build-debug
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..831ac06
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,91 @@
+cmake_minimum_required(VERSION 3.8)
+project(ccr)
+
+set(CMAKE_CXX_STANDARD 11)
+
+if (APPLE)
+    include_directories(/usr/local/opt/gmp/include /usr/local/opt/fftw/include)
+    link_directories(/usr/local/opt/gmp/lib /usr/local/opt/fftw/lib)
+    add_definitions(-DHAVE_READPASSPHRASE=1)
+
+    find_library(HAVE_CRYPTOPP cryptopp)
+    if(HAVE_CRYPTOPP)
+        add_definitions(-DHAVE_CRYPTOPP=1)
+        include_directories(/usr/local/opt/cryptopp/include)
+        link_directories(/usr/local/opt/cryptopp/lib)
+    else()
+        message(WARNING "install cryptopp by homebrew is better")
+    endif()
+
+elseif(UNIX)
+    include_directories(/usr/include)
+    link_directories(/usr/lib)
+
+    find_library(HAVE_BSDREADPASSPHRASE bsd)
+    if (HAVE_BSDREADPASSPHRASE)
+        add_definitions(-DHAVE_BSDREADPASSPHRASE=1)
+    else()
+        message(FATAL_ERROR "libbsd missing, you can install libbsd-dev package!")
+    endif()
+
+    find_library(HAVE_CRYPTOPP crypto++)
+    if(HAVE_CRYPTOPP)
+        add_definitions(-DHAVE_CRYPTOPP=1 -DCRYPTOPP_DIR_PLUS=1)
+    else()
+        message(WARNING "use crypto++ is better")
+    endif()
+
+endif (APPLE)
+
+add_definitions(-DPACKAGE_VERSION="1.8")
+
+add_executable(ccr
+        src/actions.cpp
+        src/algo_suite.cpp
+        src/algos_enc.cpp
+        src/algos_sig.cpp
+        src/base64.cpp
+        src/bvector.cpp
+        src/chacha.cpp
+        src/envelope.cpp
+        src/fft.cpp
+        src/fmtseq.cpp
+        src/generator.cpp
+        src/gf2m.cpp
+        src/hash.cpp
+        src/hashfile.cpp
+        src/iohelpers.cpp
+        src/ios.cpp
+        src/keyring.cpp
+        src/main.cpp
+        src/matrix.cpp
+        src/mce_qcmdpc.cpp
+        src/message.cpp
+        src/permutation.cpp
+        src/privfile.cpp
+        src/polynomial.cpp
+        src/sc.cpp
+        src/seclock.cpp
+        src/sencode.cpp
+        src/serialization.cpp
+        src/str_match.cpp
+        src/symkey.cpp
+        src/pwrng.cpp
+        src/xsynd.cpp)
+
+target_link_libraries(ccr fftw3 gmp)
+
+if (APPLE)
+elseif(UNIX)
+    if (HAVE_BSDREADPASSPHRASE)
+        target_link_libraries(ccr bsd)
+    endif()
+endif (APPLE)
+
+if (HAVE_CRYPTOPP)
+    if(CRYPTOPP_DIR_PLUS)
+        target_link_libraries(ccr crypto++)
+    else()
+        target_link_libraries(ccr cryptopp)
+    endif()
+endif ()
\ No newline at end of file

From d7362a0e5b1539d09b7cc1dd56fa1004ddc297ff Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Tue, 30 Jan 2018 09:25:09 +0100
Subject: [PATCH 2/3] keep .gitignore sorted and complete

---
 .gitignore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc84585..32cd6bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@ aclocal.m4
 AUTHORS
 autom4te.cache/
 ccr
+cmake-build-debug
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake
 codecrypt-*.tar.gz
 compile
 config.guess
@@ -10,6 +14,7 @@ config.status
 config.sub
 configure
 depcomp
+.idea
 INSTALL
 install-sh
 libtool
@@ -23,5 +28,3 @@ NEWS
 src/.deps/
 src/.dirstamp
 src/*.o
-.idea
-cmake-build-debug

From fb616a748ecac0c772fae6c9ae46bb13a67edbdf Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Thu, 1 Feb 2018 10:21:31 +0100
Subject: [PATCH 3/3] CMakeLists commentary

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 831ac06..112491b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,8 @@
+# Alternative way for building the project from git, viable for less-unixy
+# platforms.  Do _NOT_ use this for packaging; _DO_ use autotools instead.
+#
+# (c) 2018- tearsofphoenix <tearsofphoenix@icloud.com>
+
 cmake_minimum_required(VERSION 3.8)
 project(ccr)
 
@@ -88,4 +93,4 @@ if (HAVE_CRYPTOPP)
     else()
         target_link_libraries(ccr cryptopp)
     endif()
-endif ()
\ No newline at end of file
+endif ()