Commit 8bcd6a4d authored by Uldis Locans's avatar Uldis Locans
Browse files

check if correct DKS version is used

parent b60c7c70
......@@ -78,7 +78,8 @@ OPTION (ENABLE_DKS "Enable DKS" OFF)
### Load DKS package ###
IF (ENABLE_DKS)
FIND_PACKAGE(DKS REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
FIND_PACKAGE(DKS 1.1.0 REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
MESSAGE (STATUS "Found DKS version: ${DKS_VERSION}")
MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY}")
MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDKS_MPI")
......
......@@ -62,13 +62,13 @@ endif ()
### Uldis Locans 2014.09.05 ###
OPTION (ENABLE_DKS "Enable DKS" OFF)
#OPTION (ENABLE_DKS "Enable DKS" OFF)
### Load DKS package ###
IF (ENABLE_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 include dir: ${DKS_INCLUDE_DIR}")
#FIND_PACKAGE(DKS 1.1.0 REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
#MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY}")
#MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDKS_MPI")
### OpenCL compiler flags ###
......@@ -286,13 +286,13 @@ SET (OTHER_CXX_FLAGS
)
### Uldis Locans 2014.09.05 ###
OPTION (ENABLE_DKS "Enable DKS" OFF)
#OPTION (ENABLE_DKS "Enable DKS" OFF)
### Load DKS package ###
IF (ENABLE_DKS)
FIND_PACKAGE(DKS REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY_DIR}")
MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}")
#FIND_PACKAGE(DKS 1.1.0 REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
#MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY_DIR}")
#MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}")
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -DDKS_MPI")
### OpenCL compiler flags ###
......
cmake_minimum_required (VERSION 2.8.10)
set (DKS_VERSION \"1.0.0\")
set (DKS_VERSION_OPAL \"${DKS_VERSION}\")
configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/OPALconfig.h)
configure_file(revision.h.in ${CMAKE_CURRENT_SOURCE_DIR}/OPALrevision.h)
......
......@@ -17,4 +17,4 @@
#define PACKAGE_VERSION_STR ${PACKAGE_VERSION_STR}
/* Define DKS version used in this package. */
#define DKS_VERSION ${DKS_VERSION}
\ No newline at end of file
#define DKS_VERSION ${DKS_VERSION_OPAL}
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