Commit 674312d4 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Removed the remaining autotools-like macros HAVE_*_H from tnlConfig.h 

TNL is not supposed to have any external dependencies, so an empty
config file is useless. If some marginal parts of the project (such as
code for image processing) need to depend on some non-standard library,
they should be split into a separate module/project so that the
dependencies can be properly specified.

For now, the macros are specified as compiler parameters. Client
software using the affected headers will have to do the same.
parent 89be2b7c

CMakeLists.txt

+5 −21
Original line number Diff line number Diff line
@@ -249,33 +249,20 @@ endif() 


find_package( DCMTK )

if( DCMTK_FOUND )

   set( HAVE_DCMTK_H "#define HAVE_DCMTK_H 1" )

   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_DCMTK_H" )

   include_directories( ${DCMTK_INCLUDE_DIRS} )

   set( HAVE_DCMTK TRUE)

   set( DCMTK_LD_FLAGS "" )

   foreach( arg ${DCMTK_LIBRARIES} )

      set( DCMTK_LD_FLAGS "${DCMTK_LD_FLAGS} ${arg}" )

   endforeach( arg ${DCMTK_LIBRARIES} )

else()

   set( HAVE_DCMTK_H "//#define HAVE_DCMTK_H 1" )

endif()



find_package( PNG )

if( PNG_FOUND )

   set( HAVE_PNG_H "#define HAVE_PNG_H 1" )

   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_PNG_H" )

   include_directories( ${PNG_INCLUDE_DIRS} )

else()

   set( HAVE_PNG_H "//#define HAVE_PNG_H 1" )

   set( PNG_LIBRARIES "" )

endif()



find_package( JPEG )

if( JPEG_FOUND )

   set( HAVE_JPEG_H "#define HAVE_JPEG_H 1" )

   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_JPEG_H" )

   include_directories( ${JPEG_INCLUDE_DIRS} )

else()

   set( HAVE_JPEG_H "//#define HAVE_JPEG_H 1" )

   set( JPEG_LIBRARIES "" )

endif()



####
@@ -373,9 +360,6 @@ endif() 
#   endif()

#endif()



CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/TNL/tnlConfig.h" )

INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY} )



#Nastavime cesty k hlavickovym souborum a knihovnam

INCLUDE_DIRECTORIES( src )

INCLUDE_DIRECTORIES( ${PROJECT_BUILD_PATH} )

src/Benchmarks/HeatEquation/tnl-benchmark-heat-equation.h

+0 −1
Original line number Diff line number Diff line 
#include <TNL/tnlConfig.h>

#include <TNL/Solvers/Solver.h>

#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

src/Examples/flow-sw/navierStokes.h

+0 −1
Original line number Diff line number Diff line 
#include <TNL/tnlConfig.h>

#include <TNL/Solvers/Solver.h>

#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

src/Examples/flow-vl/navierStokes.h

+0 −1
Original line number Diff line number Diff line 
#include <TNL/tnlConfig.h>

#include <TNL/Solvers/Solver.h>

#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>

src/Examples/flow/navierStokes.h

+0 −1
Original line number Diff line number Diff line 
#include <TNL/tnlConfig.h>

#include <TNL/Solvers/Solver.h>

#include <TNL/Solvers/BuildConfigTags.h>

#include <TNL/Operators/DirichletBoundaryConditions.h>