Commit df1840a3 authored by Christof Metzger-Kraus's avatar Christof Metzger-Kraus

fixing CMake files

parent 85bc1058
...@@ -13,7 +13,13 @@ if(NOT PYTHONLIBS_FOUND OR NOT GTEST_FOUND) ...@@ -13,7 +13,13 @@ if(NOT PYTHONLIBS_FOUND OR NOT GTEST_FOUND)
return() return()
endif() endif()
IF (OPTP_USED_FROM_OPAL)
STRING (REGEX REPLACE "/[^/]+$" "/" GTEST_LIBRARY_DIRS ${GTEST_LIBRARY})
SET (RELATIVE_TO_OPAL "opt-pilot/")
ENDIF()
include_directories ( include_directories (
${GTEST_INCLUDE_DIRS}
$ENV{GTEST_PREFIX}/include $ENV{GTEST_PREFIX}/include
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
...@@ -22,6 +28,7 @@ include_directories ( ...@@ -22,6 +28,7 @@ include_directories (
link_directories ( link_directories (
$ENV{GTEST_PREFIX}/lib $ENV{GTEST_PREFIX}/lib
${GTEST_LIBRARY_DIRS}
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
) )
...@@ -95,7 +102,7 @@ set (PILOT_TESTS ...@@ -95,7 +102,7 @@ set (PILOT_TESTS
ExpressionTest ExpressionTest
SumErrSqExpressionTest SumErrSqExpressionTest
FromFileExpressionTest FromFileExpressionTest
PythonExprTest # PythonExprTest
CmdArgumentsTest CmdArgumentsTest
HashNameGeneratorTest HashNameGeneratorTest
) )
...@@ -123,9 +130,9 @@ FOREACH(test ${PILOT_TESTS}) ...@@ -123,9 +130,9 @@ FOREACH(test ${PILOT_TESTS})
ENDFOREACH(test ${PILOT_TESTS}) ENDFOREACH(test ${PILOT_TESTS})
#HACK: link resources dir to test dir #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( 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 OUTPUT_VARIABLE LN_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
) )
endif() endif()
\ No newline at end of file
...@@ -100,7 +100,7 @@ include_directories ( BEFORE ...@@ -100,7 +100,7 @@ include_directories ( BEFORE
${Trilinos_TPL_INCLUDE_DIRS} ${Trilinos_TPL_INCLUDE_DIRS}
${IPPL_SOURCE_DIRS} ${IPPL_SOURCE_DIRS}
${CCSE_INCLUDE_DIRS} ${CCSE_INCLUDE_DIRS}
${GTEST_INCLUDE_DIR} ${GTEST_INCLUDE_DIRS}
${OPTP_INCLUDE_DIR} ${OPTP_INCLUDE_DIR}
) )
...@@ -148,7 +148,7 @@ ENDIF(${HOSTNAME_BASE} MATCHES "edison" OR ${HOSTNAME_BASE} MATCHES "cori") ...@@ -148,7 +148,7 @@ ENDIF(${HOSTNAME_BASE} MATCHES "edison" OR ${HOSTNAME_BASE} MATCHES "cori")
IF (ENABLE_DKS) IF (ENABLE_DKS)
set (OPAL_LIBS set (OPAL_LIBS
${OPAL_LIBS} ${OPAL_LIBS}
dks dks
${DKS_CUDA_LIBS}) ${DKS_CUDA_LIBS})
ENDIF (ENABLE_DKS) ENDIF (ENABLE_DKS)
...@@ -170,4 +170,4 @@ set (HDRS ...@@ -170,4 +170,4 @@ set (HDRS
changes.h 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
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