Commit 1399bc57 authored by kraus's avatar kraus

The suffix rc1 isn't supported in cmake:

parent 3dd4aeea
cmake_minimum_required (VERSION 3.1)
project (OPAL VERSION 2.0.0rc1)
project (OPAL VERSION 2.0.0)
set (PROJECT_BUGREPORT opal@lists.psi.ch)
string (REGEX REPLACE "\\.([0-9])\\." ".0\\1." PACKAGE_VERSION ${PROJECT_VERSION})
......@@ -54,7 +54,7 @@ add_compile_options (-funroll-loops -fstrict-aliasing)
# compiler dependent flags
message ("The underlying C++ compiler ID is: ${CMAKE_CXX_COMPILER_ID}")
if ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
add_compile_options ("-diag-disable 383")
add_compile_options ("-diag-disable 383")
add_compile_options ("-diag-disable 981")
if (ENABLE_OpenMP)
add_compile_options (-openmp)
......@@ -164,7 +164,7 @@ IF (ENABLE_AMR)
message ("Found AMReX libraries: ${AMREX_LIBRARIES}")
message ("Found AMReX Fortran links: ${AMREX_EXTRA_Fortran_LINK_LINE}")
echo_amrex_config_options()
add_definitions(${AMREX_DEFINES})
add_definitions(-DENABLE_AMR)
add_compile_options (-Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized)
......@@ -180,7 +180,7 @@ if (ENABLE_SAAMG_SOLVER OR ENABLE_AMR_MG_SOLVER)
# Trilinos. Host specific should be avoided in almost any case.
message ("Enable SAAMG_SOLVER: " ${ENABLE_SAAMG_SOLVER})
message ("Enable AMR_MG_SOLVER: " ${ENABLE_AMR_MG_SOLVER})
find_package (Trilinos REQUIRED HINTS $ENV{TRILINOS_PREFIX} $ENV{TRILINOS_DIR} $ENV{TRILINOS})
message ("Found Trilinos: ${Trilinos_DIR}")
......@@ -269,4 +269,4 @@ install (
# mode:cmake
# cmake-tab-width: 4
# indent-tabs-mode:nil
# End:
# End:
\ No newline at end of file
  • From the documentation of cmake:

    If VERSION is specified, given components must be non-negative integers.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment