Changeset - r511:8a144437db7d
« 510:d8ca76
627:20dac2 »
512:32fb28 »
gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Prefix macro names with LEMON_ in lemon/config.h (#275)
0 8 0
default
8 files changed with 10 insertions and 10 deletions:
CMakeLists.txt
1
1
configure.ac
1
1
lemon/bits/default_map.h
1
1
lemon/config.h.cmake
1
1
lemon/config.h.in
3
3
m4/lx_check_cplex.m4
1
1
m4/lx_check_glpk.m4
1
1
m4/lx_check_soplex.m4
1
1
↑ Collapse diff ↑
CMakeLists.txt
Show white space 12 line context
... ... 
@@ -14,13 +14,13 @@
14 14 
INCLUDE(FindDoxygen)
15 15 
INCLUDE(FindGhostscript)
16 16 

			




	17
	17
	
		
ADD_DEFINITIONS(-DHAVE_CONFIG_H)


			




	18
	18
	
		

			




	19
	19
	
		
INCLUDE(CheckTypeSize)


			




	20
	
	
		
CHECK_TYPE_SIZE("long long" LONG_LONG)


			




	
	20
	
		
CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)


			




	21
	21
	
		

			




	22
	22
	
		
ENABLE_TESTING()


			




	23
	23
	
		

			




	24
	24
	
		
ADD_SUBDIRECTORY(lemon)


			




	25
	25
	
		
ADD_SUBDIRECTORY(demo)


			




	26
	26
	
		
ADD_SUBDIRECTORY(doc)

			




        

    

    

    

        

            

                

                    configure.ac
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -24,13 +24,13 @@


			




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


			




	25
	25
	
		
AC_LANG([C++])


			




	26
	26
	
		

			




	27
	27
	
		
dnl Check the existence of long long type.


			




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


			




	29
	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.])


			




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


			




	31
	31
	
		
fi


			




	32
	32
	
		

			




	33
	33
	
		
dnl Checks for programs.


			




	34
	34
	
		
AC_PROG_CXX


			




	35
	35
	
		
AC_PROG_CXXCPP


			




	36
	36
	
		
AC_PROG_INSTALL

			




        

    

    

    

        

            

                

                    lemon/bits/default_map.h
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -94,13 +94,13 @@


			




	94
	94
	
		
  template <typename _Graph, typename _Item>


			




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


			




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


			




	97
	97
	
		
  };


			




	98
	98
	
		

			




	99
	99
	
		

			




	100
	
	
		
#if defined HAVE_LONG_LONG


			




	
	100
	
		
#if defined LEMON_HAVE_LONG_LONG


			




	101
	101
	
		

			




	102
	102
	
		
  // long long


			




	103
	103
	
		
  template <typename _Graph, typename _Item>


			




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


			




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


			




	106
	106
	
		
  };

			




        

    

    

    

        

            

                

                    lemon/config.h.cmake
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	1
	
	
		
#cmakedefine HAVE_LONG_LONG 1


			




	...
	...
	
		
 No newline at end of file


			




	
	1
	
		
#cmakedefine LEMON_HAVE_LONG_LONG 1

			




        

    

    

    

        

            

                

                    lemon/config.h.in
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



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


			




	2
	
	
		
#undef HAVE_CPLEX


			




	
	2
	
		
#undef LEMON_HAVE_CPLEX


			




	3
	3
	
		

			




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


			




	5
	
	
		
#undef HAVE_GLPK


			




	
	5
	
		
#undef LEMON_HAVE_GLPK


			




	6
	6
	
		

			




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


			




	8
	
	
		
#undef HAVE_LONG_LONG


			




	
	8
	
		
#undef LEMON_HAVE_LONG_LONG

			




        

    

    

    

        

            

                

                    m4/lx_check_cplex.m4
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -58,13 +58,13 @@


			




	58
	58
	
		

			




	59
	59
	
		
    CXXFLAGS="$lx_save_cxxflags"


			




	60
	60
	
		
    LDFLAGS="$lx_save_ldflags"


			




	61
	61
	
		
    LIBS="$lx_save_libs"


			




	62
	62
	
		

			




	63
	63
	
		
    if test x"$lx_cplex_found" = x"yes"; then


			




	64
	
	
		
      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])


			




	
	64
	
		
      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])


			




	65
	65
	
		
      AC_MSG_RESULT([yes])


			




	66
	66
	
		
    else


			




	67
	67
	
		
      CPLEX_CFLAGS=""


			




	68
	68
	
		
      CPLEX_LDFLAGS=""


			




	69
	69
	
		
      CPLEX_LIBS=""


			




	70
	70
	
		
      AC_MSG_RESULT([no])

			




        

    

    

    

        

            

                

                    m4/lx_check_glpk.m4
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -56,13 +56,13 @@


			




	56
	56
	
		

			




	57
	57
	
		
    CXXFLAGS="$lx_save_cxxflags"


			




	58
	58
	
		
    LDFLAGS="$lx_save_ldflags"


			




	59
	59
	
		
    LIBS="$lx_save_libs"


			




	60
	60
	
		

			




	61
	61
	
		
    if test x"$lx_glpk_found" = x"yes"; then


			




	62
	
	
		
      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])


			




	
	62
	
		
      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])


			




	63
	63
	
		
      AC_MSG_RESULT([yes])


			




	64
	64
	
		
    else


			




	65
	65
	
		
      GLPK_CFLAGS=""


			




	66
	66
	
		
      GLPK_LDFLAGS=""


			




	67
	67
	
		
      GLPK_LIBS=""


			




	68
	68
	
		
      AC_MSG_RESULT([no])

			




        

    

    

    

        

            

                

                    m4/lx_check_soplex.m4
                

                

                  
                  
                  
                  Show white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -52,13 +52,13 @@


			




	52
	52
	
		

			




	53
	53
	
		
    CXXFLAGS="$lx_save_cxxflags"


			




	54
	54
	
		
    LDFLAGS="$lx_save_ldflags"


			




	55
	55
	
		
    LIBS="$lx_save_libs"


			




	56
	56
	
		

			




	57
	57
	
		
    if test x"$lx_soplex_found" = x"yes"; then


			




	58
	
	
		
      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])


			




	
	58
	
		
      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])


			




	59
	59
	
		
      AC_MSG_RESULT([yes])


			




	60
	60
	
		
    else


			




	61
	61
	
		
      SOPLEX_CXXFLAGS=""


			




	62
	62
	
		
      SOPLEX_LDFLAGS=""


			




	63
	63
	
		
      SOPLEX_LIBS=""


			




	64
	64
	
		
      AC_MSG_RESULT([no])


			




        

    






    
    



    


    

     
    
0 comments (0 inline)