diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | libcmix-bignum/gmp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcmix-bignum/null/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcmix-crypto/curve25519/null/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcmix-crypto/curve25519/sodium/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcmix-crypto/elgamal/gcrypt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libcmix-crypto/elgamal/null/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcmix-network/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcmix/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | liblog/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | scratchpad/CMakeLists.txt | 4 |
12 files changed, 3 insertions, 47 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d88d63..1d4c104 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,9 @@ if(use_lto) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto") endif(use_lto) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_C_STANDARD 99) + add_subdirectory(libcmix-bignum) add_subdirectory(libcmix-crypto) add_subdirectory(libcmix) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index b8fa287..c457c16 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -5,16 +5,6 @@ add_executable(client cmixclient.hpp cmixclient.cpp ) -if(WIN32) - target_compile_options(client - PRIVATE "-std=gnu++11" - ) -else(WIN32) - target_compile_options(client - PRIVATE "-std=c++11" - ) -endif(WIN32) - target_link_libraries(client PRIVATE Boost::boost PRIVATE Boost::program_options diff --git a/libcmix-bignum/gmp/CMakeLists.txt b/libcmix-bignum/gmp/CMakeLists.txt index 44b99ad..4b3acbb 100644 --- a/libcmix-bignum/gmp/CMakeLists.txt +++ b/libcmix-bignum/gmp/CMakeLists.txt @@ -8,10 +8,6 @@ add_library(${target_name} SHARED gmp_bignum.c ) -target_compile_options(${target_name} - PRIVATE -std=c99 -) - target_link_libraries(${target_name} PRIVATE cmix-bignum-interface PRIVATE gmp diff --git a/libcmix-bignum/null/CMakeLists.txt b/libcmix-bignum/null/CMakeLists.txt index 319590c..325d1c8 100644 --- a/libcmix-bignum/null/CMakeLists.txt +++ b/libcmix-bignum/null/CMakeLists.txt @@ -6,10 +6,6 @@ add_library(${target_name} SHARED null_bignum.c ) -target_compile_options(${target_name} - PRIVATE -std=c99 -) - target_link_libraries(${target_name} PRIVATE cmix-bignum-interface ) diff --git a/libcmix-crypto/curve25519/null/CMakeLists.txt b/libcmix-crypto/curve25519/null/CMakeLists.txt index e5cefdd..25c0d3b 100644 --- a/libcmix-crypto/curve25519/null/CMakeLists.txt +++ b/libcmix-crypto/curve25519/null/CMakeLists.txt @@ -6,10 +6,6 @@ add_library(${target_name} SHARED null_curve25519.c ) -target_compile_options(${target_name} - PRIVATE -std=c99 -) - target_link_libraries(${target_name} PRIVATE curve25519-interface ) diff --git a/libcmix-crypto/curve25519/sodium/CMakeLists.txt b/libcmix-crypto/curve25519/sodium/CMakeLists.txt index 78561ce..fbbedb1 100644 --- a/libcmix-crypto/curve25519/sodium/CMakeLists.txt +++ b/libcmix-crypto/curve25519/sodium/CMakeLists.txt @@ -8,10 +8,6 @@ add_library(${target_name} SHARED libsodium_curve25519.c ) -target_compile_options(${target_name} - PRIVATE -std=c99 -) - target_link_libraries(${target_name} PRIVATE curve25519-interface PUBLIC sodium diff --git a/libcmix-crypto/elgamal/gcrypt/CMakeLists.txt b/libcmix-crypto/elgamal/gcrypt/CMakeLists.txt index 826eee4..cbd49ec 100644 --- a/libcmix-crypto/elgamal/gcrypt/CMakeLists.txt +++ b/libcmix-crypto/elgamal/gcrypt/CMakeLists.txt @@ -9,7 +9,6 @@ add_library(${target_name} SHARED ) target_compile_options(${target_name} - PRIVATE -std=c99 PUBLIC ${Gcrypt_CFLAGS} ) diff --git a/libcmix-crypto/elgamal/null/CMakeLists.txt b/libcmix-crypto/elgamal/null/CMakeLists.txt index 76cd77c..40e5e8d 100644 --- a/libcmix-crypto/elgamal/null/CMakeLists.txt +++ b/libcmix-crypto/elgamal/null/CMakeLists.txt @@ -6,10 +6,6 @@ add_library(${target_name} SHARED null_elgamal.c ) -target_compile_options(${target_name} - PRIVATE -std=c99 -) - target_link_libraries(${target_name} PRIVATE elgamal-interface ) diff --git a/libcmix-network/CMakeLists.txt b/libcmix-network/CMakeLists.txt index cfe02f1..6a2f519 100644 --- a/libcmix-network/CMakeLists.txt +++ b/libcmix-network/CMakeLists.txt @@ -13,10 +13,6 @@ add_library(cmix-network uriparser.hpp uriparser.cpp ) -target_compile_options(cmix-network - PUBLIC "-std=c++11" -) - target_include_directories(cmix-network PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/libcmix/CMakeLists.txt b/libcmix/CMakeLists.txt index 885a6c8..5a7761b 100644 --- a/libcmix/CMakeLists.txt +++ b/libcmix/CMakeLists.txt @@ -7,10 +7,6 @@ target_include_directories(cmix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) -target_compile_options(cmix - PRIVATE -std=c99 -) - target_link_libraries(cmix PUBLIC cmix-crypto PUBLIC cmix-bignum diff --git a/liblog/CMakeLists.txt b/liblog/CMakeLists.txt index 3ecce93..595c72c 100644 --- a/liblog/CMakeLists.txt +++ b/liblog/CMakeLists.txt @@ -13,10 +13,6 @@ target_compile_definitions(log PUBLIC BOOST_LOG_DYN_LINK ) -target_compile_options(log - PRIVATE -std=c++11 -) - target_link_libraries(log PRIVATE Boost::system PUBLIC Boost::log diff --git a/scratchpad/CMakeLists.txt b/scratchpad/CMakeLists.txt index c1e2c75..173f091 100644 --- a/scratchpad/CMakeLists.txt +++ b/scratchpad/CMakeLists.txt @@ -6,10 +6,6 @@ add_executable(scratchpad ) target_compile_options(scratchpad - PRIVATE -std=c99 -) - -target_compile_options(scratchpad PRIVATE ${Gcrypt_CFLAGS} ) |