Commit dec326de authored by kraus's avatar kraus
Browse files

adjusting version string

parent bb5eeffa
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10) CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
PROJECT (OPAL) PROJECT (OPAL)
SET (OPAL_VERSION_MAJOR 1) SET (OPAL_VERSION_MAJOR 1)
SET (OPAL_VERSION_MINOR 3.99.1) SET (OPAL_VERSION_MINOR 4.0rc3)
IF (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
SET (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING SET (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
...@@ -74,7 +74,7 @@ IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC) ...@@ -74,7 +74,7 @@ IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
FIND_PACKAGE(DKS REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS}) FIND_PACKAGE(DKS REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY}") MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY}")
MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}") MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDKS_MPI") SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDKS_MPI")
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC) ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
### OpenCL compiler flags ### ### OpenCL compiler flags ###
...@@ -101,13 +101,13 @@ IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_OPENMP) ...@@ -101,13 +101,13 @@ IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_OPENMP)
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_OPENMP) ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_OPENMP)
### select API for DKS (temporary - will be moved to runtime) ### ### select API for DKS (temporary - will be moved to runtime) ###
IF (USE_OPENCL) IF (USE_OPENCL)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS_OPENCL") SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS_OPENCL")
ENDIF (USE_OPENCL) ENDIF (USE_OPENCL)
IF (USE_CUDA) IF (USE_CUDA)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS_CUDA") SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS_CUDA")
ENDIF (USE_CUDA) ENDIF (USE_CUDA)
IF (USE_MIC) IF (USE_MIC)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS_MIC") SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPPL_DKS_MIC")
ENDIF (USE_MIC) ENDIF (USE_MIC)
### END DKS part ### ### END DKS part ###
......
...@@ -4,7 +4,7 @@ set (PACKAGE \"opal\") ...@@ -4,7 +4,7 @@ set (PACKAGE \"opal\")
set (PACKAGE_BUGREPORT \"opal@lists.psi.ch\") set (PACKAGE_BUGREPORT \"opal@lists.psi.ch\")
set (PACKAGE_NAME \"OPAL\") set (PACKAGE_NAME \"OPAL\")
set (PACKAGE_TARNAME \"opal\") set (PACKAGE_TARNAME \"opal\")
set (PACKAGE_VERSION \"1.3.99.1\") set (PACKAGE_VERSION \"1.4.0rc3\")
configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h) configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
...@@ -104,7 +104,7 @@ set (OPAL_LIBS ...@@ -104,7 +104,7 @@ set (OPAL_LIBS
) )
IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC) IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
set (OPAL_LIBS set (OPAL_LIBS
${OPAL_LIBS} ${OPAL_LIBS}
dks) dks)
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC) ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
......
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