Skip to content

Commit

Permalink
fix space, version
Browse files Browse the repository at this point in the history
  • Loading branch information
esonghori committed Nov 20, 2015
1 parent 5689876 commit 803a733
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)


Expand All @@ -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()
Expand All @@ -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)
Expand All @@ -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)

Expand Down
24 changes: 12 additions & 12 deletions crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")

Expand All @@ -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"
"$<TARGET_OBJECTS:Crypto_BN>"
Expand All @@ -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"
"$<TARGET_OBJECTS:Crypto_BN>"
Expand All @@ -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"
"$<TARGET_OBJECTS:Crypto_BN>"
Expand All @@ -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)
target_link_libraries(OT_Main -lrt)
4 changes: 2 additions & 2 deletions scd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions tcpip/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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"
"$<TARGET_OBJECTS:TCPIP_TCPIP>"
"$<TARGET_OBJECTS:TCPIP_TCPIP_Testsuit>"
"$<TARGET_OBJECTS:Util_Log>")

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")
FAIL_REGULAR_EXPRESSION "[^a-z]Failed;failed")
4 changes: 2 additions & 2 deletions util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
FAIL_REGULAR_EXPRESSION "[^a-z]Error;ERROR;Failed;failed")

0 comments on commit 803a733

Please sign in to comment.