Merge branch 'release/v1.1.1' CMake!

.gitignore

@@ -3,23 +3,10 @@
 *.ii
 *.s
 
-# binary compiler output
-code_blocks/obj
-code_blocks/bin
-code_blocks/libEnigma/obj
-code_blocks/libEnigma/bin
-tests/obj
-tests/bin
+#CMake
+/build/
+/lib/
+/bin/
 
-# Code::Blocks
-code_blocks/enigma-opt.depend
-code_blocks/enigma-opt.layout
-enigma-opt.cscope_file_list
-tests/enigma-optima.tests.depend
-tests/enigma-optima.tests.layout
-enigma-optima.workspace.layout
-
-# CCCC
-code_blocks/.cccc
-
-code_blocks/libEnigma/libEnigma\.depend
+# generated files
+optima/config/releaseVersion.cpp

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "extern/gbench"]
+	path = extern/gbench
+	url = ../../google/benchmark.git
+[submodule "extern/gtest"]
+	path = extern/gtest
+	url = ../../abseil/googletest.git

BOINC/CMakeLists.txt

@@ -0,0 +1,7 @@
+if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+    add_subdirectory(Windows)
+elseif(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    add_subdirectory(Linux)
+endif()
+
+

BOINC/Linux/CMakeLists.txt

@@ -0,0 +1,4 @@
+configure_file (
+    "app_info.in.xml"
+    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/app_info.xml"
+)

BOINC/Linux/app_info.xml → BOINC/Linux/app_info.in.xml

@@ -1,12 +1,12 @@
 <app_info>
 	<app>
 		<name>enigma_m4_2</name>
-		<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<app>
 		<name>enigma_m4_3</name>
-		<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima AV ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<file_info>

BOINC/Windows/CMakeLists.txt

@@ -0,0 +1,10 @@
+if(ENIGMA_BUILD_32_BIT)
+    set(APP_INFO_FOLDER x86)
+else()
+    set(APP_INFO_FOLDER x64)
+endif()
+
+configure_file (
+    "${APP_INFO_FOLDER}/app_info.in.xml"
+    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/app_info.xml"
+)

BOINC/Windows/x64/app_info.xml → BOINC/Windows/x64/app_info.in.xml

@@ -1,12 +1,12 @@
 <app_info>
 	<app>
 		<name>enigma_m4_2</name>
-		<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<app>
 		<name>enigma_m4_3</name>
-		<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima AV ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<file_info>

BOINC/Windows/x86/app_info.xml → BOINC/Windows/x86/app_info.in.xml

@@ -1,12 +1,12 @@
 <app_info>
 	<app>
 		<name>enigma_m4_2</name>
-		<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<app>
 		<name>enigma_m4_3</name>
-		<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima AV ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<file_info>

CMakeLists.txt

@@ -0,0 +1,133 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(enigma_optima_suite 
+    VERSION 1.1.1
+    LANGUAGES C CXX)
+
+set(default_build_type "RelWithDebInfo")
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_CONFIGURATION_TYPES "Debug RelWithDebInfo")
+    message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
+    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
+        STRING "Choose the type of build." FORCE)
+    # Set the possible values of build type for cmake-gui
+    # set_property accepts a semicolon separated list
+    set(CMAKE_CONFIGURATION_TYPE_LIST "${CMAKE_CONFIGURATION_TYPES}")
+    separate_arguments(CMAKE_CONFIGURATION_TYPE_LIST)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPE_LIST})
+endif()
+
+# Substitute default flags (use -O3 instead of -O2)
+if(CMAKE_C_COMPILER_ID MATCHES "GNU"
+    AND CMAKE_CXX_COMPILER_ID MATCHES "GNU"
+    AND NOT ENIGMA_DEFAULT_FLAGS_SET)
+    if(NOT ENIGMA_DEFAULT_FLAGS_RELWITHDEBINFO)
+        set(ENIGMA_DEFAULT_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+    endif()
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${ENIGMA_DEFAULT_FLAGS_RELWITHDEBINFO}" CACHE STRING "" FORCE)
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${ENIGMA_DEFAULT_FLAGS_RELWITHDEBINFO}" CACHE STRING "" FORCE)
+    set(ENIGMA_DEFAULT_FLAGS_SET ON CACHE BOOL "Whether C/CXX_FLAGS_RELWITHDEBINFO has been changed" FORCE)
+    mark_as_advanced(ENIGMA_DEFAULT_FLAGS_SET)
+endif()
+
+if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+    option(ENIGMA_BUILD_32_BIT "Build 32 bit artifacts (x86)" OFF)
+    if(ENIGMA_BUILD_32_BIT)
+        set(ENIGMA_BITS_DIRECTORY_NAME "/x86")
+    else()
+        set(ENIGMA_BITS_DIRECTORY_NAME "/x64")
+    endif()
+else()
+    set(ENIGMA_BITS_DIRECTORY_NAME "")
+endif()
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib/${ENIGMA_BITS_DIRECTORY_NAME}")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib/${ENIGMA_BITS_DIRECTORY_NAME}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin/${ENIGMA_BITS_DIRECTORY_NAME}")
+
+if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+    include(CheckCCompilerFlag)
+    include(CheckCXXCompilerFlag)
+    if(ENIGMA_BUILD_32_BIT)
+        add_compile_options(-m32 -march=pentium3)
+        # Disable position independent code generation
+        # * default on Windows
+        # * without it Linux code is significantly slower
+        add_compile_options(-fno-pic -fno-pie)
+        # add_link_options in CMake 3.13
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
+
+        check_cxx_compiler_flag(-no-pie GCC_HAS_NO_PIE_OPTION)
+        if(GCC_HAS_NO_PIE_OPTION)
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
+        endif()
+    else()
+        # Official MinGW-w64 builds have changed arch
+        add_compile_options(-m64 -march=x86-64)
+        # add_link_options in CMake 3.13
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m64")
+    endif()
+    # Official MinGW-w64 builds have changed tune
+    add_compile_options(-mtune=generic)
+
+    check_c_compiler_flag(-Wimplicit-fallthrough=5 GCC_HAS_IMPLICIT_FALLTHROUGH)
+    if(GCC_HAS_IMPLICIT_FALLTHROUGH)
+        list(APPEND ENIGMA_COMPILE_OPTIONS -Wimplicit-fallthrough=5)        
+    endif()
+
+    # treat some warnings as errors
+    list(APPEND ENIGMA_COMPILE_OPTIONS    
+        -Werror=implicit-function-declaration
+        -Werror=return-type)
+    # add some warnings
+    list(APPEND ENIGMA_COMPILE_OPTIONS
+        -Wall
+        -Wcast-align
+        -Wextra
+        -Wfloat-equal
+        -Wmissing-declarations
+        -Wredundant-decls
+        -Wshadow
+        -Wunsafe-loop-optimizations
+        -Wvector-operation-performance)
+    # and change call convention for all targets
+    add_compile_options(
+        -fcall-used-xmm6
+        -fcall-used-xmm7
+        -fcall-used-xmm8
+        -fcall-used-xmm9
+        -fcall-used-xmm10
+        -fcall-used-xmm11
+        -fcall-used-xmm12
+        -fcall-used-xmm13
+        -fcall-used-xmm14
+        -fcall-used-xmm15)
+
+    set(ENIGMA_CXX_COMPILE_OPTIONS
+        -Wnon-virtual-dtor)
+endif()
+
+find_package(Git REQUIRED)
+execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty 
+    OUTPUT_VARIABLE ENIGMA_GIT_DESCRIBE_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+add_subdirectory(libEnigma)
+
+add_subdirectory(optima)
+
+add_subdirectory(benchmark)
+
+add_subdirectory(BOINC)
+
+enable_testing()
+add_subdirectory(tests)
+
+set(BENCHMARK_BUILD_32_BITS ${ENIGMA_BUILD_32_BIT} CACHE BOOL "" FORCE)
+set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "")
+set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "")
+add_subdirectory(extern/gbench)
+
+set(INSTALL_GTEST OFF CACHE BOOL "")
+set(BUILD_GMOCK OFF CACHE BOOL "")
+add_subdirectory(extern/gtest)