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
7
Merge Requests
7
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
df1840a3
Commit
df1840a3
authored
Jul 22, 2017
by
Christof Metzger-Kraus
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing CMake files
parent
85bc1058
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
opt-pilot/Tests/CMakeLists.txt
opt-pilot/Tests/CMakeLists.txt
+10
-3
src/CMakeLists.txt
src/CMakeLists.txt
+3
-3
No files found.
opt-pilot/Tests/CMakeLists.txt
View file @
df1840a3
...
...
@@ -13,7 +13,13 @@ if(NOT PYTHONLIBS_FOUND OR NOT GTEST_FOUND)
return
()
endif
()
IF
(
OPTP_USED_FROM_OPAL
)
STRING
(
REGEX REPLACE
"/[^/]+$"
"/"
GTEST_LIBRARY_DIRS
${
GTEST_LIBRARY
}
)
SET
(
RELATIVE_TO_OPAL
"opt-pilot/"
)
ENDIF
()
include_directories
(
${
GTEST_INCLUDE_DIRS
}
$ENV{GTEST_PREFIX}/include
${
Boost_INCLUDE_DIRS
}
${
CMAKE_SOURCE_DIR
}
...
...
@@ -22,6 +28,7 @@ include_directories (
link_directories
(
$ENV{GTEST_PREFIX}/lib
${
GTEST_LIBRARY_DIRS
}
${
PYTHON_LIBRARIES
}
)
...
...
@@ -95,7 +102,7 @@ set (PILOT_TESTS
ExpressionTest
SumErrSqExpressionTest
FromFileExpressionTest
PythonExprTest
#
PythonExprTest
CmdArgumentsTest
HashNameGeneratorTest
)
...
...
@@ -123,9 +130,9 @@ FOREACH(test ${PILOT_TESTS})
ENDFOREACH
(
test
${
PILOT_TESTS
}
)
#HACK: link resources dir to test dir
if
(
NOT EXISTS
${
PROJECT_BINARY_DIR
}
/Tests/resources
)
if
(
NOT EXISTS
${
PROJECT_BINARY_DIR
}
/
${
RELATIVE_TO_OPAL
}
Tests/resources
)
EXECUTE_PROCESS
(
COMMAND ln -s
${
OPT_PILOT_SOURCE_DIR
}
/Tests/resources
${
PROJECT_BINARY_DIR
}
/Tests/
COMMAND ln -s
${
OPT_PILOT_SOURCE_DIR
}
/Tests/resources
${
PROJECT_BINARY_DIR
}
/
${
RELATIVE_TO_OPAL
}
Tests/
OUTPUT_VARIABLE LN_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif
()
\ No newline at end of file
src/CMakeLists.txt
View file @
df1840a3
...
...
@@ -100,7 +100,7 @@ include_directories ( BEFORE
${
Trilinos_TPL_INCLUDE_DIRS
}
${
IPPL_SOURCE_DIRS
}
${
CCSE_INCLUDE_DIRS
}
${
GTEST_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
S
}
${
OPTP_INCLUDE_DIR
}
)
...
...
@@ -148,7 +148,7 @@ ENDIF(${HOSTNAME_BASE} MATCHES "edison" OR ${HOSTNAME_BASE} MATCHES "cori")
IF
(
ENABLE_DKS
)
set
(
OPAL_LIBS
${
OPAL_LIBS
}
dks
dks
${
DKS_CUDA_LIBS
}
)
ENDIF
(
ENABLE_DKS
)
...
...
@@ -170,4 +170,4 @@ set (HDRS
changes.h
)
install
(
FILES
${
HDRS
}
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/include/src"
)
install
(
FILES
${
HDRS
}
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/include/src"
)
\ No newline at end of file
snuverink_j
@snuverink_j
mentioned in issue
#198 (closed)
·
Dec 22, 2017
mentioned in issue
#198 (closed)
mentioned in issue #198
Toggle commit list
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