Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
S
src
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
75
Issues
75
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Code Review
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OPAL
src
Commits
dec326de
Commit
dec326de
authored
Aug 26, 2015
by
kraus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjusting version string
parent
bb5eeffa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
CMakeLists.txt
CMakeLists.txt
+5
-5
src/CMakeLists.txt
src/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
dec326de
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.10
)
PROJECT
(
OPAL
)
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
)
SET
(
CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
...
...
@@ -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}
)
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"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DDKS_MPI"
)
ENDIF
(
ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC
)
### OpenCL compiler flags ###
...
...
@@ -101,13 +101,13 @@ IF (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) ###
IF
(
USE_OPENCL
)
IF
(
USE_OPENCL
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DIPPL_DKS_OPENCL"
)
ENDIF
(
USE_OPENCL
)
IF
(
USE_CUDA
)
IF
(
USE_CUDA
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DIPPL_DKS_CUDA"
)
ENDIF
(
USE_CUDA
)
IF
(
USE_MIC
)
IF
(
USE_MIC
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DIPPL_DKS_MIC"
)
ENDIF
(
USE_MIC
)
### END DKS part ###
...
...
src/CMakeLists.txt
View file @
dec326de
...
...
@@ -4,7 +4,7 @@ set (PACKAGE \"opal\")
set
(
PACKAGE_BUGREPORT \"opal@lists.psi.ch\"
)
set
(
PACKAGE_NAME \"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
)
...
...
@@ -104,7 +104,7 @@ set (OPAL_LIBS
)
IF
(
ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC
)
set
(
OPAL_LIBS
set
(
OPAL_LIBS
${
OPAL_LIBS
}
dks
)
ENDIF
(
ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment