Commit 68c6fbc9 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed tests in cmake files

parent bc5695ea

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ else() 
endif()



if( WITH_TESTS STREQUAL "yes" )

   enable_testing()

   find_package( GTest )

   if( GTEST_FOUND )

      set( CXX_TESTS_FLAGS "-DHAVE_GTEST" )

src/UnitTests/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -37,3 +37,4 @@ ADD_TEST( FileTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/FileTest${mpiEx 
ADD_TEST( StringTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/StringTest${mpiExt}${debugExt} )

ADD_TEST( ListTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/ListTest${mpiExt}${debugExt} )

ADD_TEST( ObjectTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/ObjectTest${mpiExt}${debugExt} )

ADD_TEST( UniquePointerTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/UniquePointerTest${mpiExt}${debugExt} )

src/UnitTests/Containers/CMakeLists.txt

+18 −6
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ IF( BUILD_CUDA ) 
   SET_TARGET_PROPERTIES( MultiArrayTest${mpiExt}${debugExt} PROPERTIES COMPILE_FLAGS "${CXX_TESTS_FLAGS}" )

   TARGET_LINK_LIBRARIES( MultiArrayTest${mpiExt}${debugExt} ${GTEST_BOTH_LIBRARIES}

                                                           tnl${mpiExt}${debugExt}-${tnlVersion} )

ELSE(  BUILD_CUDA )

   ADD_EXECUTABLE( MultiArrayTest${mpiExt}${debugExt} MultiArrayTest.h MultiArrayTest.cpp )

   SET_TARGET_PROPERTIES( MultiArrayTest${mpiExt}${debugExt} PROPERTIES COMPILE_FLAGS "${CXX_TESTS_FLAGS}" )

   TARGET_LINK_LIBRARIES( MultiArrayTest${mpiExt}${debugExt} ${GTEST_BOTH_LIBRARIES}

                                                           tnl${mpiExt}${debugExt}-${tnlVersion} )

ENDIF( BUILD_CUDA )



IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( StaticArrayTest${mpiExt}${debugExt} StaticArrayTest.h StaticArrayTest.cu )

   SET_TARGET_PROPERTIES( StaticArrayTest${mpiExt}${debugExt} PROPERTIES COMPILE_FLAGS "${CXX_TESTS_FLAGS}" )

   TARGET_LINK_LIBRARIES( StaticArrayTest${mpiExt}${debugExt} ${GTEST_BOTH_LIBRARIES}

                                                           tnl${mpiExt}${debugExt}-${tnlVersion} )

ELSE(  BUILD_CUDA )

   ADD_EXECUTABLE( StaticArrayTest${mpiExt}${debugExt} StaticArrayTest.h StaticArrayTest.cpp )

   SET_TARGET_PROPERTIES( StaticArrayTest${mpiExt}${debugExt} PROPERTIES COMPILE_FLAGS "${CXX_TESTS_FLAGS}" )