From ae433bf43e40b65676e79436c2f43c624f8b9df3 Mon Sep 17 00:00:00 2001 From: Lucas Czech Date: Tue, 15 Aug 2017 16:12:12 +0200 Subject: [PATCH] Change to more recent Genesis version. --- CMakeLists.txt | 19 +++++++++++++++---- genesis | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0557e3f..60b64a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,10 +50,11 @@ option ( BUILD_STATIC "Build the static version of the executable." ON ) if( BUILD_STATIC AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") string(ASCII 27 Esc) - message( STATUS "${Esc}[33m" - "Compiler is not GNU. This might cause trouble with statically linking system libraries. " - "If the compilation fails with some linking error, try a different compiler, or try to not " - "build statically by deactivating the CMake option 'BUILD_STATIC'. See Readme for details." + message( STATUS "${Esc}[31m" + "Compiler is not GCC. This might cause trouble with statically linking system libraries " + "on Linux systems. If the compilation fails with some linking error, try a different compiler, " + "or try to not build statically by deactivating the CMake option 'BUILD_STATIC'. " + "See BUILD.md for details." "${Esc}[0m" ) endif() @@ -98,6 +99,16 @@ set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GENESIS_EXE_LINKER_FLAG # Add Tclap as dependency. It's header-only, so this is easy. include_directories( "tclap/include" ) +# Genesis export the OpenMP variable. We use it to check and give advice in case it is not found. +if( NOT OPENMP_FOUND ) + string(ASCII 27 Esc) + message( STATUS "${Esc}[31m" + "Could not find OpenMP. This results in a considerably slower runtime for the program. Try " + "to use a different compiler. Alternatively, if you are sure your compiler supports OpenMP, " + "you can add the needed compiler flags to the CMake script. See BUILD.md for details." + "${Esc}[0m" ) +endif() + # ------------------------------------------------------------------------------ # Sources # ------------------------------------------------------------------------------ diff --git a/genesis b/genesis index ff17934..1629190 160000 --- a/genesis +++ b/genesis @@ -1 +1 @@ -Subproject commit ff179349c2ce9c06fc37302a005fa0ba33640b20 +Subproject commit 1629190c3064c963d960aecd70a0fc94ba088ac1