From 803a733be2d4c14405ded2a6b338222f466c667e Mon Sep 17 00:00:00 2001 From: Ebrahim Songhori Date: Thu, 19 Nov 2015 19:08:29 -0600 Subject: [PATCH] fix space, version --- CMakeLists.txt | 12 ++++++------ crypto/CMakeLists.txt | 24 ++++++++++++------------ scd/CMakeLists.txt | 4 ++-- tcpip/CMakeLists.txt | 14 +++++++------- util/CMakeLists.txt | 4 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c90137..cd7f1e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.1.0 FATAL_ERROR) -project (TinyGarble - VERSION 1.0.3 +project (TinyGarble + VERSION 1.0.4 LANGUAGES CXX) @@ -9,7 +9,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${PROJECT_BINARY_DIR}) ############## -# build type +# build type if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif() @@ -24,7 +24,7 @@ endif () ############### # Compiler flags -set(CMAKE_CXX_FLAGS +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-strict-aliasing -march=native") set (CMAKE_CXX_STANDARD 11) @@ -34,11 +34,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG") ############### # Library -## Boost +## Boost set (Boost_USE_STATIC_LIBS OFF) set (Boost_USE_MULTITHREADED ON) set (Boost_USE_STATIC_RUNTIME OFF) -find_package (Boost 1.45.0 +find_package (Boost 1.45.0 REQUIRED COMPONENTS program_options) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 9dd8b4c..7c5c3e7 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -1,9 +1,9 @@ add_library (Crypto_BN OBJECT "BN.cpp") - + add_library (Crypto_OT OBJECT "OT.cpp") - + add_library (Crypto_OT_Extension OBJECT "OT_extension.cpp") @@ -22,13 +22,13 @@ if (Boost_FOUND) endif (Boost_FOUND) target_link_libraries(BN_Test -lrt) -add_test (Crypto_BN_Test +add_test (Crypto_BN_Test BN_Test --log2std) - + set_tests_properties (Crypto_BN_Test PROPERTIES FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed") - + add_executable(OT_Test "OT_test.cpp" "$" @@ -46,13 +46,13 @@ if (Boost_FOUND) endif (Boost_FOUND) target_link_libraries(OT_Test -lrt) -add_test (Crypto_OT_Test +add_test (Crypto_OT_Test OT_Test --log2std) - + set_tests_properties (Crypto_OT_Test PROPERTIES FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed") - + add_executable(OT_Extension_Test "OT_extension_test.cpp" "$" @@ -71,13 +71,13 @@ if (Boost_FOUND) endif (Boost_FOUND) target_link_libraries(OT_Extension_Test -lrt) -add_test (Crypto_OT_Extension_Test +add_test (Crypto_OT_Extension_Test OT_Extension_Test --log2std) - + set_tests_properties (Crypto_OT_Extension_Test PROPERTIES FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed") - + add_executable(OT_Main "OT_main.cpp" "$" @@ -93,4 +93,4 @@ endif (OPENSSL_FOUND) if (Boost_FOUND) target_link_libraries(OT_Main ${Boost_LIBRARIES}) endif (Boost_FOUND) -target_link_libraries(OT_Main -lrt) \ No newline at end of file +target_link_libraries(OT_Main -lrt) diff --git a/scd/CMakeLists.txt b/scd/CMakeLists.txt index a64988f..3a7848b 100644 --- a/scd/CMakeLists.txt +++ b/scd/CMakeLists.txt @@ -56,9 +56,9 @@ if (OPENSSL_FOUND) endif (OPENSSL_FOUND) target_link_libraries(SCD_Evaluator_Test -lrt) -add_test (SCD_SCD_Evaluator_Test +add_test (SCD_SCD_Evaluator_Test SCD_Evaluator_Test --log2std) - + set_tests_properties (SCD_SCD_Evaluator_Test PROPERTIES FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed") diff --git a/tcpip/CMakeLists.txt b/tcpip/CMakeLists.txt index dcc5433..b441bc9 100644 --- a/tcpip/CMakeLists.txt +++ b/tcpip/CMakeLists.txt @@ -1,23 +1,23 @@ add_library (TCPIP_TCPIP OBJECT "tcpip.cpp") - + add_library (TCPIP_TCPIP_Testsuit OBJECT "tcpip_testsuit.cpp") - + add_executable(TCPIP_Test "tcpip_test.cpp" "$" "$" "$") - + if (Boost_FOUND) target_link_libraries(TCPIP_Test ${Boost_LIBRARIES}) endif (Boost_FOUND) target_link_libraries(TCPIP_Test -lrt) -add_test (TCPIP_TCPIP_Test +add_test (TCPIP_TCPIP_Test TCPIP_Test --log2std) - -set_tests_properties (TCPIP_TCPIP_Test + +set_tests_properties (TCPIP_TCPIP_Test PROPERTIES - FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed") \ No newline at end of file + FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed") diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index a8a39ab..7f4b70e 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(Util_Test -lrt) add_test (Util_Util_Test Util_Test --log2std) - + set_tests_properties (Util_Util_Test PROPERTIES - FAIL_REGULAR_EXPRESSION "[^a-z]Error;ERROR;Failed;failed") \ No newline at end of file + FAIL_REGULAR_EXPRESSION "[^a-z]Error;ERROR;Failed;failed")