From 55c3c547ed79b5c9010823c0afeb27d43fcfd552 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Sun, 20 Sep 2020 12:34:19 +0100 Subject: [PATCH] build: Allow installation --- CMakeLists.txt | 19 +++++++++++++++++-- {src => include/monero_seed}/galois_field.hpp | 0 {src => include/monero_seed}/gf_elem.hpp | 0 {src => include/monero_seed}/gf_poly.hpp | 0 {src => include/monero_seed}/monero_seed.hpp | 0 .../monero_seed}/reed_solomon_code.hpp | 0 .../monero_seed}/secure_random.hpp | 0 {src => include/monero_seed}/wordlist.hpp | 0 src/galois_field.cpp | 2 +- src/gf_elem.cpp | 2 +- src/gf_poly.cpp | 2 +- src/monero_seed.cpp | 10 +++++----- src/reed_solomon_code.cpp | 2 +- src/secure_random.cpp | 2 +- src/wordlist.cpp | 2 +- 15 files changed, 28 insertions(+), 13 deletions(-) rename {src => include/monero_seed}/galois_field.hpp (100%) rename {src => include/monero_seed}/gf_elem.hpp (100%) rename {src => include/monero_seed}/gf_poly.hpp (100%) rename {src => include/monero_seed}/monero_seed.hpp (100%) rename {src => include/monero_seed}/reed_solomon_code.hpp (100%) rename {src => include/monero_seed}/secure_random.hpp (100%) rename {src => include/monero_seed}/wordlist.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f066ab..649e67d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright (c) 2020, tevador -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required(VERSION 3.13) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) @@ -9,6 +9,8 @@ endif() project(monero-seed) +include(GNUInstallDirs) + add_library(${PROJECT_NAME} src/argon2/blake2/blake2b.c src/argon2/argon2.c @@ -24,4 +26,17 @@ src/secure_random.cpp src/wordlist.cpp) set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) -target_include_directories(${PROJECT_NAME} PUBLIC src) +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(EXPORT ${PROJECT_NAME} + FILE ${PROJECT_NAME}Config.cmake + NAMESPACE ${PROJECT_NAME}:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) diff --git a/src/galois_field.hpp b/include/monero_seed/galois_field.hpp similarity index 100% rename from src/galois_field.hpp rename to include/monero_seed/galois_field.hpp diff --git a/src/gf_elem.hpp b/include/monero_seed/gf_elem.hpp similarity index 100% rename from src/gf_elem.hpp rename to include/monero_seed/gf_elem.hpp diff --git a/src/gf_poly.hpp b/include/monero_seed/gf_poly.hpp similarity index 100% rename from src/gf_poly.hpp rename to include/monero_seed/gf_poly.hpp diff --git a/src/monero_seed.hpp b/include/monero_seed/monero_seed.hpp similarity index 100% rename from src/monero_seed.hpp rename to include/monero_seed/monero_seed.hpp diff --git a/src/reed_solomon_code.hpp b/include/monero_seed/reed_solomon_code.hpp similarity index 100% rename from src/reed_solomon_code.hpp rename to include/monero_seed/reed_solomon_code.hpp diff --git a/src/secure_random.hpp b/include/monero_seed/secure_random.hpp similarity index 100% rename from src/secure_random.hpp rename to include/monero_seed/secure_random.hpp diff --git a/src/wordlist.hpp b/include/monero_seed/wordlist.hpp similarity index 100% rename from src/wordlist.hpp rename to include/monero_seed/wordlist.hpp diff --git a/src/galois_field.cpp b/src/galois_field.cpp index 88cb838..675dd26 100644 --- a/src/galois_field.cpp +++ b/src/galois_field.cpp @@ -3,7 +3,7 @@ All rights reserved. */ -#include "galois_field.hpp" +#include template galois_field::galois_field() { diff --git a/src/gf_elem.cpp b/src/gf_elem.cpp index 26924fc..6f2a69b 100644 --- a/src/gf_elem.cpp +++ b/src/gf_elem.cpp @@ -3,6 +3,6 @@ All rights reserved. */ -#include "gf_elem.hpp" +#include const gf_2048 gf_elem::field; diff --git a/src/gf_poly.cpp b/src/gf_poly.cpp index 83d9380..cc8af39 100644 --- a/src/gf_poly.cpp +++ b/src/gf_poly.cpp @@ -3,7 +3,7 @@ All rights reserved. */ -#include "gf_poly.hpp" +#include gf_poly::gf_poly(gf_elem coeff, unsigned degree) : degree_(0) { coeff_[degree] = coeff; diff --git a/src/monero_seed.cpp b/src/monero_seed.cpp index f8da0bb..302ef5f 100644 --- a/src/monero_seed.cpp +++ b/src/monero_seed.cpp @@ -3,11 +3,11 @@ All rights reserved. */ -#include "monero_seed.hpp" -#include "secure_random.hpp" -#include "wordlist.hpp" -#include "gf_poly.hpp" -#include "reed_solomon_code.hpp" +#include +#include +#include +#include +#include #include "argon2/argon2.h" #include "argon2/blake2/blake2-impl.h" #include "pbkdf2.h" diff --git a/src/reed_solomon_code.cpp b/src/reed_solomon_code.cpp index a2d2f07..4b80539 100644 --- a/src/reed_solomon_code.cpp +++ b/src/reed_solomon_code.cpp @@ -3,7 +3,7 @@ All rights reserved. */ -#include "reed_solomon_code.hpp" +#include #include reed_solomon_code::reed_solomon_code(unsigned check_digits) : generator(1, 0) { diff --git a/src/secure_random.cpp b/src/secure_random.cpp index da284d4..4c8b750 100644 --- a/src/secure_random.cpp +++ b/src/secure_random.cpp @@ -3,7 +3,7 @@ All rights reserved. */ -#include "secure_random.hpp" +#include #include #include diff --git a/src/wordlist.cpp b/src/wordlist.cpp index 1b14376..dc1cd1f 100644 --- a/src/wordlist.cpp +++ b/src/wordlist.cpp @@ -3,7 +3,7 @@ All rights reserved. */ -#include "wordlist.hpp" +#include #include const static std::string english_words[] = {