Commit 5815a724 authored by kraus's avatar kraus
Browse files

changing version of master as discussed

parent fad06935
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
PROJECT (OPAL)
SET (OPAL_VERSION_MAJOR 1)
SET (OPAL_VERSION_MINOR 3.1)
SET (OPAL_VERSION_MINOR 3.99)
IF (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
SET (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
......@@ -29,10 +29,10 @@ message (STATUS "The underlying C++ compiler is: ${CMAKE_CXX_COMPILER}")
# compiler dependent flags
if ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
add_definitions (-diag-disable 383 -diag-disable 981)
elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
add_definitions (-Wall -Werror -Wsign-compare -Wunused-variable -Warray-bounds -DIPPL_RESTRICT_BUG)
elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "4.7.3")
message (FATAL_ERROR "To build OPAL you need GCC version 4.7.3 or greater")
......@@ -190,4 +190,4 @@ ELSE()
ENDIF()
ADD_SUBDIRECTORY (classic/5.0/src)
ADD_SUBDIRECTORY (src)
ADD_SUBDIRECTORY (src)
\ No newline at end of file
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 2.8.10)
set (PACKAGE \"opal\")
set (PACKAGE_BUGREPORT \"opal@lists.psi.ch\")
set (PACKAGE_NAME \"OPAL\")
set (PACKAGE_TARNAME \"opal\")
set (PACKAGE_VERSION \"1.3.1\")
set (PACKAGE_VERSION \"1.3.99\")
configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
......@@ -133,4 +133,4 @@ install (TARGETS ${TEST_EXE} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
install (TARGETS opal RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
install (TARGETS OPALib DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")
install (FILES opal.h DESTINATION "${CMAKE_INSTALL_PREFIX}/include")
install (FILES Utilities/OpalException.h DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Utilities")
install (FILES Utilities/OpalException.h DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Utilities")
\ No newline at end of file
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