Merge branch 'gtest'

Author: qnfm

CMakeLists.txt

@@ -1,244 +1,16 @@
 cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
-
 set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
 
-project(Keyak C)
-
-if(NOT CMAKE_VS_PLATFORM_NAME)
-    set(CMAKE_VS_PLATFORM_NAME "x64")
-endif()
-message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+project(OceanKeyak C)
 
-if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
-     OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86"))
-    message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
-endif()
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-################################################################################
-# Global configuration types
-################################################################################
-set(CMAKE_CONFIGURATION_TYPES
-    "Debug"
-    "Release"
-    CACHE STRING "" FORCE
-)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-find_package(Sodium REQUIRED)
-
-
-################################################################################
-# Nuget packages function stub.
-################################################################################
-function(use_package TARGET PACKAGE VERSION)
-    message(WARNING "No implementation of use_package. Create yours. "
-                    "Package \"${PACKAGE}\" with version \"${VERSION}\" "
-                    "for target \"${TARGET}\" is ignored!")
-endfunction()
-
 
-
-################################################################################
-# Use solution folders feature
-################################################################################
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+find_package(Sodium REQUIRED)
 
 ################################################################################
 # Sub-projects
 ################################################################################
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-set(PROJECT_NAME Keyak)
-
-################################################################################
-# Source groups
-################################################################################
-set(Header_Files
-    "align.h"
-    "api.h"
-    "brg_endian.h"
-    "config.h"
-    "crypto_aead.h"
-    "encrypt.h"
-    "KeccakP-1600-times4-SIMD256.c"
-    "KeccakP-1600-times4-SnP.h"
-    "KeccakP-1600-unrolling.macros"
-    "Keyakv2.h"
-    "Keyakv2.inc"
-    "Motorist.inc"
-    "SIMD256-config.h"
-)
-source_group("Header Files" FILES ${Header_Files})
-
-set(Source_Files
-    "encrypt.c"
-    "Keyak.c"
-    "main.c"
-)
-source_group("Source Files" FILES ${Source_Files})
-
-set(ALL_FILES
-    ${Header_Files}
-    ${Source_Files}
-)
-
-################################################################################
-# Target
-################################################################################
-add_executable(${PROJECT_NAME} ${ALL_FILES})
-
-set(ROOT_NAMESPACE Keyak)
-
-
-
-################################################################################
-# Compile and link options
-################################################################################
-if(MSVC)
-    
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        VS_GLOBAL_KEYWORD "Win32Proj"
-    )
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
-        )
-    endif()
-    ################################################################################
-    # Include directories
-    ################################################################################
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_include_directories(${PROJECT_NAME} PUBLIC
-            "${CMAKE_CURRENT_SOURCE_DIR}/"
-            "D:/dev/c/libsodium/include"
-        )
-    endif()
-
-    ################################################################################
-    # Compile definitions
-    ################################################################################
-
-
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE
-            "$<$<CONFIG:Debug>:"
-                "_CRT_SECURE_NO_WARNINGS;"
-                "_DEBUG"
-            ">"
-            "$<$<CONFIG:Release>:"
-                "NDEBUG"
-            ">"
-            "_CONSOLE;"
-            "UNICODE;"
-            "_UNICODE"
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE
-            "$<$<CONFIG:Debug>:"
-                "_DEBUG"
-            ">"
-            "$<$<CONFIG:Release>:"
-                "NDEBUG"
-            ">"
-            "WIN32;"
-            "_CONSOLE;"
-            "UNICODE;"
-            "_UNICODE"
-        )
-    endif()
-
-    if (sodium_USE_STATIC_LIBS)
-        string(APPEND _LINK_TYPE "/MT")
-    else()
-        string(APPEND _LINK_TYPE "/MT")
-    endif()
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_compile_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Release>:
-                /Oi;
-                /Gy
-            >
-            /permissive-;
-            /sdl;
-            /W3;
-            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
-            ${DEFAULT_CXX_EXCEPTION_HANDLING};
-            ${_LINK_TYPE}
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
-        target_compile_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Release>:
-                /Oi;
-                /Gy
-            >
-            /permissive-;
-            /sdl;
-            /W3;
-            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
-            ${DEFAULT_CXX_EXCEPTION_HANDLING};
-            ${_LINK_TYPE}
-        )
-    endif()
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_link_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Debug>:
-                /INCREMENTAL
-            >
-            $<$<CONFIG:Release>:
-                /OPT:REF;
-                /OPT:ICF;
-                /INCREMENTAL:NO
-            >
-            /DEBUG;
-            /SUBSYSTEM:CONSOLE
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
-        target_link_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Debug>:
-                /INCREMENTAL
-            >
-            $<$<CONFIG:Release>:
-                /OPT:REF;
-                /OPT:ICF;
-                /INCREMENTAL:NO
-            >
-            /DEBUG;
-            /SUBSYSTEM:CONSOLE
-        )
-    endif()
-else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
-    # target_compile_definitions(${PROJECT_NAME} PRIVATE "-msse2")
-endif()
-
-
-target_link_libraries(${PROJECT_NAME} PUBLIC sodium PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
-
+add_subdirectory(src)
+add_subdirectory(tests)