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

Removed obsolete scripts tnl-bindir and tnl-compile and update quickstart's Makefile 

- The concept of tnl-bindir is completely useless - it was intended for
  checking if the user configured their $PATH, but the user had to
  already configure  $PATH  in order to use the script.
- The tnl-compile script was used in the quickstart-generated Makefile,
  but gave obsolete output. Moreover, the script approach is inflexible
  and does not provide any benefits compared to hard-coding flags
  directly in the Makefile.
parent ad476ebd

src/Tools/CMakeLists.txt

+3 −9
Original line number Diff line number Diff line 
add_subdirectory(tnl-quickstart)



CONFIGURE_FILE( "tnl-compile.in" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-compile" @ONLY )

CONFIGURE_FILE( "tnl-bindir.in" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-bindir" @ONLY )



ADD_EXECUTABLE(tnl-grid-setup tnl-grid-setup.cpp )

ADD_EXECUTABLE(tnl-grid-to-mesh tnl-grid-to-mesh.cpp )

ADD_EXECUTABLE(tnl-mesh-converter tnl-mesh-converter.cpp )
@@ -84,9 +81,6 @@ INSTALL( TARGETS tnl-init 
                 tnl-lattice-init

         DESTINATION bin )



INSTALL( FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-bindir

               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-compile

               tnl-err2eoc

INSTALL( FILES tnl-err2eoc

               tnl-log-to-html.py

         DESTINATION bin

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
         DESTINATION bin )

src/Tools/tnl-bindir.in

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
#!/usr/bin/env bash



echo @CMAKE_INSTALL_PREFIX@/bin
 
 No newline at end of file

src/Tools/tnl-compile.in

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#!/usr/bin/env bash



DEBUG_FLAGS="-DNDEBUG" # -march=native"

CUDA_FLAGS=""

CXX_STD_FLAGS="-std=c++11"



for option in "$@"

do

    case $option in

        --cuda                  ) CUDA_FLAGS="-DHAVE_CUDA `tnl-cuda-arch`" ;;

        --debug                 ) DEBUG_FLAGS="-g -O0"

    esac

done



echo -I@CMAKE_INSTALL_PREFIX@/include ${CUDA_FLAGS} ${CXX_STD_FLAGS} ${DEBUG_FLAGS}

src/Tools/tnl-err2eoc

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

src/Tools/tnl-quickstart/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line 
INSTALL( FILES tnl-quickstart

               tnl-quickstart.py

         DESTINATION bin

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )



INSTALL( FILES build-config-tag.h.in

               Makefile.in

               Makefile

               config.mk

               explicit-laplace-grid-1d_impl.h.in

               explicit-laplace-grid-2d_impl.h.in

               explicit-laplace-grid-3d_impl.h.in