Commit 0708c30d authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed compilation options for tests 

Standard CMAKE_CXX_FLAGS are a space-delimited list, but our
CXX_TESTS_FLAGS are manually passed to CUDA_ADD_EXECUTABLE, which
expects a semicolon-delimited list. Blame cmake for such a crazy
language...
parent d536d4b9

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ if( CXX_COMPILER_NAME MATCHES "icpc" ) 
       message( "Compile MIC support..."    )

       set( MIC_CXX_FLAGS "-DHAVE_MIC")

       # build all tests with MIC support

       set( CXX_TESTS_FLAGS "${CXX_TESTS_FLAGS} -DHAVE_MIC" )

       set( CXX_TESTS_FLAGS ${CXX_TESTS_FLAGS} -DHAVE_MIC )

       set( WITH_CUDA "no")

   else()

       set( MIC_CXX_FLAGS "")

src/UnitTests/CMakeLists.txt

+5 −5
Original line number Diff line number Diff line
@@ -4,32 +4,32 @@ ADD_SUBDIRECTORY( Containers ) 
ADD_SUBDIRECTORY( Matrices )



ADD_EXECUTABLE( UniquePointerTest${mpiExt}${debugExt} UniquePointerTest.cpp )

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

TARGET_COMPILE_OPTIONS( UniquePointerTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( UniquePointerTest${mpiExt}${debugExt}

                           ${GTEST_BOTH_LIBRARIES}

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



IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( FileTest${mpiExt}${debugExt} FileTest.cu OPTIONS "${CXX_TESTS_FLAGS}" )

   CUDA_ADD_EXECUTABLE( FileTest${mpiExt}${debugExt} FileTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( FileTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ELSE(  BUILD_CUDA )               

   ADD_EXECUTABLE( FileTest${mpiExt}${debugExt} FileTest.cpp )

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

   TARGET_COMPILE_OPTIONS( FileTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( FileTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ENDIF( BUILD_CUDA )



ADD_EXECUTABLE( StringTest${mpiExt}${debugExt} StringTest.cpp )

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

TARGET_COMPILE_OPTIONS( StringTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StringTest${mpiExt}${debugExt}

                           ${GTEST_BOTH_LIBRARIES}

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



ADD_EXECUTABLE( ObjectTest${mpiExt}${debugExt} ObjectTest.cpp )

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

TARGET_COMPILE_OPTIONS( ObjectTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( ObjectTest${mpiExt}${debugExt}

                           ${GTEST_BOTH_LIBRARIES} 

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

src/UnitTests/Containers/CMakeLists.txt

+11 −11
Original line number Diff line number Diff line 
ADD_EXECUTABLE( ListTest${mpiExt}${debugExt} ListTest.cpp )

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

TARGET_COMPILE_OPTIONS( ListTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( ListTest${mpiExt}${debugExt}

                           ${GTEST_BOTH_LIBRARIES}

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



IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( ArrayOperationsTest${mpiExt}${debugExt} ArrayOperationsTest.cu

                        OPTIONS "${CXX_TESTS_FLAGS}" )

                        OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( ArrayOperationsTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ELSE(  BUILD_CUDA )

   ADD_EXECUTABLE( ArrayOperationsTest${mpiExt}${debugExt} ArrayOperationsTest.cpp )

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

   TARGET_COMPILE_OPTIONS( ArrayOperationsTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( ArrayOperationsTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

                              tnl${mpiExt}${debugExt}-${tnlVersion} )
@@ -20,20 +20,20 @@ ENDIF( BUILD_CUDA ) 


IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( ArrayTest${mpiExt}${debugExt} ArrayTest.cu

                        OPTIONS "${CXX_TESTS_FLAGS}" )

                        OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( ArrayTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ELSE(  BUILD_CUDA )

   ADD_EXECUTABLE( ArrayTest${mpiExt}${debugExt} ArrayTest.cpp )

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

   TARGET_COMPILE_OPTIONS( ArrayTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( ArrayTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ENDIF( BUILD_CUDA )



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

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

TARGET_COMPILE_OPTIONS( StaticArrayTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticArrayTest${mpiExt}${debugExt}

                           ${GTEST_BOTH_LIBRARIES}

                           tnl${mpiExt}${debugExt}-${tnlVersion} )
@@ -41,33 +41,33 @@ TARGET_LINK_LIBRARIES( StaticArrayTest${mpiExt}${debugExt} 
# NOTE: Vector = Array + VectorOperations, so we test Vector and VectorOperations at the same time

IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( VectorTest${mpiExt}${debugExt} VectorTest.cu

                        OPTIONS "${CXX_TESTS_FLAGS}" )

                        OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( VectorTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ELSE(  BUILD_CUDA )

   ADD_EXECUTABLE( VectorTest${mpiExt}${debugExt} VectorTest.cpp )

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

   TARGET_COMPILE_OPTIONS( VectorTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( VectorTest${mpiExt}${debugExt}

                              ${GTEST_BOTH_LIBRARIES}

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

ENDIF( BUILD_CUDA )



ADD_EXECUTABLE( StaticVectorTest${mpiExt}${debugExt} StaticVectorTest.cpp )

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

TARGET_COMPILE_OPTIONS( StaticVectorTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticVectorTest${mpiExt}${debugExt}

                           ${GTEST_BOTH_LIBRARIES}

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



#IF( BUILD_CUDA )

#   CUDA_ADD_EXECUTABLE( MultiArrayTest${mpiExt}${debugExt} MultiArrayTest.cu

#                        OPTIONS "${CXX_TESTS_FLAGS}" )

#                        OPTIONS ${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.cpp )

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

#   TARGET_COMPILE_OPTIONS( MultiArrayTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

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

#                              ${GTEST_BOTH_LIBRARIES}

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

src/UnitTests/Matrices/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line 
IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( SparseMatrixCopyTest${mpiExt}${debugExt} SparseMatrixCopyTest.h SparseMatrixCopyTest.cu OPTIONS "${CXX_TESTS_FLAGS}" )

   CUDA_ADD_EXECUTABLE( SparseMatrixCopyTest${mpiExt}${debugExt} SparseMatrixCopyTest.h SparseMatrixCopyTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

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

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

ELSE(  BUILD_CUDA )

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

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

   TARGET_COMPILE_OPTIONS( SparseMatrixCopyTest${mpiExt}${debugExt} PRIVATE ${CXX_TESTS_FLAGS} )

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

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

ENDIF( BUILD_CUDA )