Commit d536d4b9 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Cleaned up compilation options in CMakeLists.txt

parent ce87e091

src/Tools/CMakeLists.txt

+1 −6
Original line number Diff line number Diff line
@@ -56,12 +56,7 @@ ADD_EXECUTABLE(tnl-curve2gnuplot${debugExt} ${tnlcurve2gnuplotsources}) 
target_link_libraries (tnl-curve2gnuplot${debugExt} tnl${debugExt}-${tnlVersion} )



IF( BUILD_CUDA )

    CUDA_ADD_EXECUTABLE( tnl-cuda-arch${debugExt} tnl-cuda-arch.cu

                         OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

    SET_TARGET_PROPERTIES( tnl-cuda-arch${debugExt} PROPERTIES CUDA_COMPILE_FLAGS "${CXX_OPTIMIZE_FLAGS}" )

ENDIF()

         

IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( tnl-cuda-arch${debugExt} tnl-cuda-arch.cu )

   INSTALL( TARGETS tnl-cuda-arch${debugExt}

            RUNTIME DESTINATION bin

            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

tests/unit-tests/operators/diffusion/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ if( BUILD_CUDA ) 
   CUDA_ADD_EXECUTABLE( tnlLinearDiffusionTest-cuda${mpiExt}${debugExt} ${headers} tnlLinearDiffusionTest.cu )

   TARGET_LINK_LIBRARIES( tnlLinearDiffusionTest-cuda${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}

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

   CUDA_ADD_EXECUTABLE( tnlOneSidedMeanCurvatureTest-cuda${mpiExt}${debugExt} ${headers} tnlOneSidedMeanCurvatureTest.cu

                        OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

   CUDA_ADD_EXECUTABLE( tnlOneSidedMeanCurvatureTest-cuda${mpiExt}${debugExt} ${headers} tnlOneSidedMeanCurvatureTest.cu )

   TARGET_LINK_LIBRARIES( tnlOneSidedMeanCurvatureTest-cuda${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}

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

tests/unit-tests/operators/fdm/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ TARGET_LINK_LIBRARIES( tnlFiniteDifferencesTest${mpiExt}${debugExt} ${CPPUNIT_LI 
                                                                 tnl${mpiExt}${debugExt}-0.1 )



if( BUILD_CUDA )                                                           

   CUDA_ADD_EXECUTABLE( tnlFiniteDifferencesTest-cuda${mpiExt}${debugExt} ${headers} tnlFiniteDifferencesTest.cu

                        OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

   CUDA_ADD_EXECUTABLE( tnlFiniteDifferencesTest-cuda${mpiExt}${debugExt} ${headers} tnlFiniteDifferencesTest.cu )

   TARGET_LINK_LIBRARIES( tnlFiniteDifferencesTest-cuda${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}

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

endif()

tests/unit-tests/operators/geometric/CMakeLists.txt

+3 −8
Original line number Diff line number Diff line
@@ -11,20 +11,15 @@ TARGET_LINK_LIBRARIES( tnlCoFVMGradientNormTest${mpiExt}${debugExt} ${CPPUNIT_LI 
                                                                 tnl${mpiExt}${debugExt}-0.1 )



if( BUILD_CUDA )                                                           

   CUDA_ADD_EXECUTABLE( tnlFDMGradientNormTest-cuda${mpiExt}${debugExt} ${headers} tnlFDMGradientNormTest.cu

                        OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

   CUDA_ADD_EXECUTABLE( tnlFDMGradientNormTest-cuda${mpiExt}${debugExt} ${headers} tnlFDMGradientNormTest.cu )

   TARGET_LINK_LIBRARIES( tnlFDMGradientNormTest-cuda${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}

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

   

   CUDA_ADD_EXECUTABLE( tnlTwoSidedGradientNormTest-cuda${mpiExt}${debugExt} ${headers} tnlTwoSidedGradientNormTest.cu

                        OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

   CUDA_ADD_EXECUTABLE( tnlTwoSidedGradientNormTest-cuda${mpiExt}${debugExt} ${headers} tnlTwoSidedGradientNormTest.cu )

   TARGET_LINK_LIBRARIES( tnlTwoSidedGradientNormTest-cuda${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}

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



   CUDA_ADD_EXECUTABLE( tnlCoFVMGradientNormTest-cuda${mpiExt}${debugExt} ${headers} tnlCoFVMGradientNormTest.cu

                        OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS} )

   CUDA_ADD_EXECUTABLE( tnlCoFVMGradientNormTest-cuda${mpiExt}${debugExt} ${headers} tnlCoFVMGradientNormTest.cu )

   TARGET_LINK_LIBRARIES( tnlCoFVMGradientNormTest-cuda${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}

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



endif()