clean up cmake

.travis.yml

@@ -66,7 +66,7 @@ before_install:
 
 script:
   - cat /proc/cpuinfo
-  - cmake -DUSE_RANDOM_DEVICE=ON -DCMAKE_BUILD_TYPE=$TYPE . && make
+  - cmake -DCMAKE_BUILD_TYPE=$TYPE . && make
   - ./run ./bin/aes 12345  
   - ./run ./bin/sha1 12345  
   - ./run ./bin/sha256 12345  

CMakeLists.txt

@@ -2,36 +2,19 @@ cmake_minimum_required (VERSION 2.8.11)
 project (emp-ag2pc)
 set(NAME "emp-ag2pc")
 
-if(POLICY CMP0042)
-  cmake_policy(SET CMP0042 NEW) # use rpath on macOS
-endif()
-include_directories(${CMAKE_SOURCE_DIR})
-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_SOURCE_DIR}/cmake)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} cmake/)
-macro (add_test _name)
-	add_executable("${_name}" "test/${_name}.cpp" ${basics})
-	target_link_libraries("${_name}" ${EMP-OT_LIBRARIES})
-endmacro()
-if(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE Release)
-endif(NOT CMAKE_BUILD_TYPE)
-message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
-
-set (CMAKE_C_FLAGS "-pthread -Wall -march=native -O3 -maes -mrdseed -mavx2")
-set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-
-OPTION(USE_RANDOM_DEVICE "Option description" OFF)
-IF(USE_RANDOM_DEVICE)
-     ADD_DEFINITIONS(-DEMP_USE_RANDOM_DEVICE)
-ENDIF(USE_RANDOM_DEVICE)
-
+find_path(CMAKE_FOLDER NAMES cmake/emp-tool-config.cmake)
+include(${CMAKE_FOLDER}/cmake/common.cmake)
+include(${CMAKE_FOLDER}/cmake/source_of_randomness.cmake)
+include(${CMAKE_FOLDER}/cmake/threading.cmake)
 
 FIND_PACKAGE(emp-ot REQUIRED)
 INCLUDE_DIRECTORIES(${EMP-OT_INCLUDE_DIRS})
 
+# Test cases
+macro (add_test _name)
+	add_test_with_lib(${_name} ${EMP-OT_LIBRARIES})
+endmacro()
+
 add_test(aes)
 add_test(sha1)
 add_test(sha256)