Commit 2a924e21 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Added flag to turn off build with Python.

parent c22b95eb

build

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ do 
        --with-coverage=*                ) WITH_COVERAGE="${option#*=}" ;;

        --with-examples=*                ) WITH_EXAMPLES="${option#*=}" ;;

        --with-tools=*                   ) WITH_TOOLS="${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#*=}" ;;
@@ -89,6 +90,7 @@ then 
    echo "   --with-coverage=yes/no                Enables code coverage reports for unit tests. 'no' by default (lcov is required)."

    echo "   --with-examples=yes/no                Compile the 'examples' directory. 'yes' by default."

    echo "   --with-tools=yes/no                   Compile the 'tools' directory. 'yes' by default."

    echo "   --with-python=yes/no                  Compile with the python bindings. '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."
@@ -133,6 +135,7 @@ ${CMAKE} ${ROOT_DIR} \ 
         -DWITH_COVERAGE=${WITH_COVERAGE} \

         -DWITH_EXAMPLES=${WITH_EXAMPLES} \

         -DWITH_TOOLS=${WITH_TOOLS} \

         -DWITH_PYTHON=${WITH_PYTHON} \

         -DDCMTK_DIR=${DCMTK_DIR} \

         -DWITH_TEMPLATE_INSTANTIATION=${WITH_TEMPLATE_INSTANTIATION} \

         -DINSTANTIATE_FLOAT=${INSTANTIATE_FLOAT} \

src/CMakeLists.txt

+12 −3
Original line number Diff line number Diff line 
#ADD_SUBDIRECTORY( Python )

if( WITH_TOOLS STREQUAL "yes" )

   ADD_SUBDIRECTORY( Python )

endif( WITH_TOOLS STREQUAL "yes" )



ADD_SUBDIRECTORY( TNL )



if( WITH_TOOLS STREQUAL "yes" )

   ADD_SUBDIRECTORY( Tools )

endif( WITH_TOOLS STREQUAL "yes" )



if( WITH_TESTS STREQUAL "yes" )

   ADD_SUBDIRECTORY( UnitTests )

endif( WITH_TESTS STREQUAL "yes" )

src/Tools/CMakeLists.txt

+64 −67
Original line number Diff line number Diff line 
if( WITH_TOOLS STREQUAL "yes" )



add_subdirectory (tnl-quickstart)



CONFIGURE_FILE( "tnl-compile.in" "${PROJECT_TOOLS_PATH}/tnl-compile" @ONLY )
@@ -65,4 +63,3 @@ if( WITH_TOOLS STREQUAL "yes" ) 
         DESTINATION bin

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

endif( WITH_TOOLS STREQUAL "yes" )
 
 No newline at end of file

src/UnitTests/CMakeLists.txt

+50 −52
Original line number Diff line number Diff line 
if( WITH_TESTS STREQUAL "yes" )



ADD_SUBDIRECTORY( Containers )

ADD_SUBDIRECTORY( Functions )

ADD_SUBDIRECTORY( Matrices )
@@ -49,4 +47,4 @@ if( WITH_TESTS STREQUAL "yes" ) 
ADD_TEST( UniquePointerTest ${EXECUTABLE_OUTPUT_PATH}/UniquePointerTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( SaveAndLoadMeshfunctionTest ${EXECUTABLE_OUTPUT_PATH}/SaveAndLoadMeshfunctionTest${CMAKE_EXECUTABLE_SUFFIX} )



endif( WITH_TESTS STREQUAL "yes" )