tests/CMakeLists.txt: conflict from cherry-pick resolved

tests/CMakeLists.txt

@@ -61,5 +61,15 @@ INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS}
 
 # Build the test exe. We don't do an install on the unit test exe as it is
 # assumed that this is internal to opal
-ADD_EXECUTABLE(${TEST_EXE} ${TEST_SRCS}) # the opal and classic sources are not needed again if we link against libOPAL and libCLASSIC!
-TARGET_LINK_LIBRARIES(${TEST_EXE} OPALib ${OPAL_LIBS} ${Trilinos_LIBRARIES} ${Trilinos_TPL_LIBRARIES} ${AMREX_LIBRARIES} -lgfortran ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${GTEST_BOTH_LIBRARIES} -lpthread)
+# the opal and classic sources are not needed again if we link against libOPAL and libCLASSIC!
+ADD_EXECUTABLE(${TEST_EXE} ${TEST_SRCS})
+TARGET_LINK_LIBRARIES(
+	${TEST_EXE}
+	OPALib
+	${OPAL_LIBS}
+	${Trilinos_LIBRARIES} ${Trilinos_TPL_LIBRARIES}
+	${AMREX_LIBRARIES}
+	${OTHER_CMAKE_EXE_LINKER_FLAGS}
+	${GTEST_BOTH_LIBRARIES}
+	-lpthread
+)