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

Removed build flags for explicit template instantiation 

The code for explicit template instantiation was already removed anyway...
parent 61b5aa8d

CMakeLists.txt

+0 −30
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ option(WITH_TOOLS "Compile the 'src/Tools' directory" ON) 
option(WITH_BENCHMARKS "Compile the 'src/Benchmarks' directory" ON)

option(WITH_PYTHON "Compile the Python bindings" ON)

option(WITH_DOC "Generate documentation" ON)

option(WITH_TEMPLATES_INSTANTIATION "Enable explicit template instantiation" OFF)



# install paths relative to the cmake's prefix

set( TNL_TARGET_INCLUDE_DIRECTORY "include/TNL" )
@@ -342,34 +341,6 @@ endif() 
#   endif()

#endif()



####

# Explicit template instantiation

#

#if( ${WITH_TEMPLATE_INSTANTIATION} )

#   AddCompilerFlag( "-DTEMPLATE_EXPLICIT_INSTANTIATION " )

#

#   if( INSTANTIATE_INT STREQUAL "yes" )

#      AddCompilerFlag( "-DINSTANTIATE_INT " )

#   endif()

#

#   if( INSTANTIATE_LONG_INT STREQUAL "yes" )

#      AddCompilerFlag( "-DINSTANTIATE_LONG_INT " )

#   endif()

#

#   if( INSTANTIATE_FLOAT STREQUAL "yes" )

#      AddCompilerFlag( "-DINSTANTIATE_FLOAT " )

#   endif()

#

#   if( INSTANTIATE_DOUBLE STREQUAL "yes" )

#      AddCompilerFlag( "-DINSTANTIATE_DOUBLE " )

#   endif()

#

#   if( INSTANTIATE_LONG_DOUBLE STREQUAL "yes" )

#      AddCompilerFlag( "-DINSTANTIATE_LONG_DOUBLE " )

#   endif()

#endif()



#Nastavime cesty k hlavickovym souborum a knihovnam

INCLUDE_DIRECTORIES( src )

INCLUDE_DIRECTORIES( ${PROJECT_BUILD_PATH} )

LINK_DIRECTORIES( ${LIBRARY_OUTPUT_PATH} )
@@ -433,7 +404,6 @@ message( " WITH_EXAMPLES = ${WITH_EXAMPLES}" ) 
message( "   WITH_TOOLS = ${WITH_TOOLS}" )

message( "   WITH_BENCHMARKS = ${WITH_BENCHMARKS}" )

message( "   WITH_PYTHON = ${WITH_PYTHON}" )

message( "   WITH_TEMPLATES_INSTANTIATION = ${WITH_TEMPLATES_INSTANTIATION}" )

# Print compiler options

message( "-- Compiler options:" )

message( "   CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}" )

build

+1 −27
Original line number Diff line number Diff line
@@ -30,13 +30,6 @@ WITH_PYTHON="yes" 
WITH_TOOLS="yes"

WITH_BENCHMARKS="yes"



WITH_TEMPLATE_INSTANTIATION="no"

INSTANTIATE_LONG_INT="no"

INSTANTIATE_INT="yes"

INSTANTIATE_LONG_DOUBLE="no"

INSTANTIATE_DOUBLE="yes"

INSTANTIATE_FLOAT="no"



for option in "$@"

do

    case $option in
@@ -66,18 +59,6 @@ do 
        --with-tools=*                   ) WITH_TOOLS="${option#*=}" ;;

        --with-benchmarks=*              ) WITH_BENCHMARKS="${option#*=}" ;;

        --with-python=*                  ) WITH_PYTHON="${option#*=}" ;;

        --with-templates-instantiation=* ) WITH_TEMPLATE_INSTANTIATION="${option#*=}" ;;

        --instantiate-long-int=*         ) INSTANTIATE_LONG_INT="${option#*=}" ;;

        --instantiate-int=*              ) INSTANTIATE_INT="${option#*=}" ;;

        --instantiate-long-double=*      ) INSTANTIATE_LONG_DOUBLE="${option#*=}" ;;

        --instantiate-double=*           ) INSTANTIATE_DOUBLE="${option#*=}" ;;

        --instantiate-float=*            ) INSTANTIATE_FLOAT="${option#*=}" ;;

        --fast-build                     ) INSTANTIATE_LONG_INT="no"

                                           INSTANTIATE_INT="yes"

                                           INSTANTIATE_LONG_DOUBLE="no"

                                           INSTANTIATE_DOUBLE="yes"

                                           INSTANTIATE_FLOAT="no"

                                           WITH_CUDA_ARCH="auto" ;;

        *                                )

           echo "Unknown option ${option}. Use --help for more information."

           exit 1 ;;
@@ -106,7 +87,6 @@ if [[ ${HELP} == "yes" ]]; then 
    echo "   --with-tools=yes/no                   Compile the 'src/Tools' directory. 'yes' by default."

    echo "   --with-python=yes/no                  Compile the Python bindings. 'yes' by default."

    echo "   --with-benchmarks=yes/no              Compile the 'src/Benchmarks' directory. 'yes' by default."

    echo "   --with-templates-instantiation=yes/no Precompiles some TNL templates during the build. 'no' by default."

    echo "   --cmake=CMAKE                         Path to cmake. 'cmake' by default."

    echo "   --verbose                             It enables verbose build."

    echo "   --root-dir=PATH                       Path to the TNL source code root dir."
@@ -181,12 +161,6 @@ cmake_command=( 
         -DWITH_PYTHON=${WITH_PYTHON}

         -DWITH_BENCHMARKS=${WITH_BENCHMARKS}

         -DDCMTK_DIR=${DCMTK_DIR}

         -DWITH_TEMPLATE_INSTANTIATION=${WITH_TEMPLATE_INSTANTIATION}

         -DINSTANTIATE_FLOAT=${INSTANTIATE_FLOAT}

         -DINSTANTIATE_DOUBLE=${INSTANTIATE_DOUBLE}

         -DINSTANTIATE_LONG_DOUBLE=${INSTANTIATE_LONG_DOUBLE}

         -DINSTANTIATE_INT=${INSTANTIATE_INT}

         -DINSTANTIATE_LONG_INT=${INSTANTIATE_LONG_INT}

)



# Skip running cmake if it was already run and the cmake command is the same.