Changeset - r515:7992dcb0d0e6
« 514:14a7e7
516:7d7d9d »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Add long long checking to build systems (#230)
0 5 1
default
6 files changed with 17 insertions and 2 deletions:
lemon/config.h.cmake
1
CMakeLists.txt
3
configure.ac
8
lemon/bits/default_map.h
1
1
lemon/config.h.in
3
lemon/tolerance.h
1
1
↑ Collapse diff ↑
lemon/config.h.cmake
Ignore white space 6 line context
1 
#cmakedefine HAVE_LONG_LONG 1
... ... 
 No newline at end of file
CMakeLists.txt
Ignore white space 6 line context
... ... 
@@ -11,12 +11,15 @@
11 11 

			




	12
	12
	
		
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)


			




	13
	13
	
		

			




	14
	14
	
		
INCLUDE(FindDoxygen)


			




	15
	15
	
		
INCLUDE(FindGhostscript)


			




	16
	16
	
		

			




	
	17
	
		
INCLUDE(CheckTypeSize)


			




	
	18
	
		
CHECK_TYPE_SIZE("long long" LONG_LONG)


			




	
	19
	
		

			




	17
	20
	
		
ENABLE_TESTING()


			




	18
	21
	
		

			




	19
	22
	
		
ADD_SUBDIRECTORY(lemon)


			




	20
	23
	
		
ADD_SUBDIRECTORY(demo)


			




	21
	24
	
		
ADD_SUBDIRECTORY(doc)


			




	22
	25
	
		
ADD_SUBDIRECTORY(test)

			




        

    

    

    

        

            

                

                    configure.ac
                

                

                  
                  
                  
                  Ignore white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -21,12 +21,18 @@


			




	21
	21
	
		

			




	22
	22
	
		
lx_cmdline_cxxflags_set=${CXXFLAGS+set}


			




	23
	23
	
		

			




	24
	24
	
		
dnl Do compilation tests using the C++ compiler.


			




	25
	25
	
		
AC_LANG([C++])


			




	26
	26
	
		

			




	
	27
	
		
dnl Check the existence of long long type.


			




	
	28
	
		
AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])


			




	
	29
	
		
if test x"$long_long_found" = x"yes"; then


			




	
	30
	
		
  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])


			




	
	31
	
		
fi


			




	
	32
	
		

			




	27
	33
	
		
dnl Checks for programs.


			




	28
	34
	
		
AC_PROG_CXX


			




	29
	35
	
		
AC_PROG_CXXCPP


			




	30
	36
	
		
AC_PROG_INSTALL


			




	31
	37
	
		
AC_DISABLE_SHARED


			




	32
	38
	
		
AC_PROG_LIBTOOL


			




	...
	...
	
		
@@ -113,12 +119,14 @@


			




	113
	119
	
		
echo


			




	114
	120
	
		
echo Package version............... : $PACKAGE-$VERSION


			




	115
	121
	
		
echo


			




	116
	122
	
		
echo C++ compiler.................. : $CXX


			




	117
	123
	
		
echo C++ compiles flags............ : $CXXFLAGS


			




	118
	124
	
		
echo


			




	
	125
	
		
echo Compiler supports long long... : $long_long_found


			




	
	126
	
		
echo


			




	119
	127
	
		
#echo GLPK support.................. : $lx_glpk_found


			




	120
	128
	
		
#echo CPLEX support................. : $lx_cplex_found


			




	121
	129
	
		
#echo SOPLEX support................ : $lx_soplex_found


			




	122
	130
	
		
#echo


			




	123
	131
	
		
echo Build demo programs........... : $enable_demo


			




	124
	132
	
		
echo Build additional tools........ : $enable_tools

			




        

    

    

    

        

            

                

                    lemon/bits/default_map.h
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -93,13 +93,13 @@


			




	93
	93
	
		
  template <typename _Graph, typename _Item>


			




	94
	94
	
		
  struct DefaultMapSelector<_Graph, _Item, unsigned long> {


			




	95
	95
	
		
    typedef VectorMap<_Graph, _Item, unsigned long> Map;


			




	96
	96
	
		
  };


			




	97
	97
	
		

			




	98
	98
	
		

			




	99
	
	
		
#if defined __GNUC__ && !defined __STRICT_ANSI__


			




	
	99
	
		
#if defined HAVE_LONG_LONG


			




	100
	100
	
		

			




	101
	101
	
		
  // long long


			




	102
	102
	
		
  template <typename _Graph, typename _Item>


			




	103
	103
	
		
  struct DefaultMapSelector<_Graph, _Item, signed long long> {


			




	104
	104
	
		
    typedef VectorMap<_Graph, _Item, signed long long> Map;


			




	105
	105
	
		
  };

			




        

    

    

    

        

            

                

                    lemon/config.h.in
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	1
	1
	
		
/* Define to 1 if you have CPLEX. */


			




	2
	2
	
		
#undef HAVE_CPLEX


			




	3
	3
	
		

			




	4
	4
	
		
/* Define to 1 if you have GLPK. */


			




	5
	5
	
		
#undef HAVE_GLPK


			




	
	6
	
		

			




	
	7
	
		
/* Define to 1 if you have long long */


			




	
	8
	
		
#undef HAVE_LONG_LONG

			




        

    

    

    

        

            

                

                    lemon/tolerance.h
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -368,13 +368,13 @@


			




	368
	368
	
		
    ///@}


			




	369
	369
	
		

			




	370
	370
	
		
    ///Returns zero


			




	371
	371
	
		
    static Value zero() {return 0;}


			




	372
	372
	
		
  };


			




	373
	373
	
		

			




	374
	
	
		
#if defined __GNUC__ && !defined __STRICT_ANSI__


			




	
	374
	
		
#if HAVE_LONG_LONG 


			




	375
	375
	
		

			




	376
	376
	
		
  ///Long long integer specialization of Tolerance.


			




	377
	377
	
		

			




	378
	378
	
		
  ///Long long integer specialization of Tolerance.


			




	379
	379
	
		
  ///\warning This class (more exactly, type <tt>long long</tt>)


			




	380
	380
	
		
  ///is not ansi compatible.


			




        

    






    
    



    


    

     
    
0 comments (0 inline)