fixing CMake files

opt-pilot/Tests/CMakeLists.txt

@@ -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

@@ -100,7 +100,7 @@ include_directories ( BEFORE
     ${Trilinos_TPL_INCLUDE_DIRS}
     ${IPPL_SOURCE_DIRS}
     ${CCSE_INCLUDE_DIRS}
-    ${GTEST_INCLUDE_DIR}
+    ${GTEST_INCLUDE_DIRS}
     ${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