Changeset - r619:ec817dfc2cb7
« 611:85cb3a
620:c3ce59 »
gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
FindGLPK improvements (#256)
0 4 0
default
4 files changed with 8 insertions and 11 deletions:
CMakeLists.txt
6
cmake/FindGLPK.cmake
7
lemon/CMakeLists.txt
1
1
test/CMakeLists.txt
4
↑ Collapse diff ↑
CMakeLists.txt
Ignore white space 6 line context
... ... 
@@ -28,8 +28,2 @@
28 28 

			




	29
	
	
		
IF(GLPK_FOUND)


			




	30
	
	
		
  SET(HAVE_LP TRUE)


			




	31
	
	
		
  SET(HAVE_MIP TRUE)


			




	32
	
	
		
  SET(HAVE_GLPK TRUE)


			




	33
	
	
		
ENDIF(GLPK_FOUND)


			




	34
	
	
		

			




	35
	29
	
		
INCLUDE(CheckTypeSize)

			




        

    

    

    

        

            

                

                    cmake/FindGLPK.cmake
                

                

                  
                  
                  
                  Show white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -15,2 +15,3 @@


			




	15
	15
	
		
IF(GLPK_FOUND)


			




	
	16
	
		
  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})


			




	16
	17
	
		
  SET(GLPK_LIBRARIES ${GLPK_LIBRARY})


			




	...
	...
	
		
@@ -20,1 +21,7 @@


			




	20
	21
	
		
MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)


			




	
	22
	
		

			




	
	23
	
		
IF(GLPK_FOUND)


			




	
	24
	
		
  SET(HAVE_LP TRUE)


			




	
	25
	
		
  SET(HAVE_MIP TRUE)


			




	
	26
	
		
  SET(HAVE_GLPK TRUE)


			




	
	27
	
		
ENDIF(GLPK_FOUND)

			




        

    

    

    

        

            

                

                    lemon/CMakeLists.txt
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -22,3 +22,3 @@


			




	22
	22
	
		
  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)


			




	23
	
	
		
  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})


			




	
	23
	
		
  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})


			




	24
	24
	
		
  IF(WIN32)

			




        

    

    

    

        

            

                

                    test/CMakeLists.txt
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -5,6 +5,2 @@


			




	5
	5
	
		

			




	6
	
	
		
IF(HAVE_GLPK)


			




	7
	
	
		
  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})


			




	8
	
	
		
ENDIF(HAVE_GLPK)


			




	9
	
	
		

			




	10
	6
	
		
LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)


			




        

    






    
    



    


    

     
    
0 comments (0 inline)