Changeset - r666:ec817dfc2cb7
« 658:85cb3a
667: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
Show white space 8 line context
... ... 
@@ -25,14 +25,8 @@
25 25 
# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
26 26 
# C4996: 'function': was declared deprecated
27 27 
ENDIF(MSVC)
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)


			




	36
	30
	
		
CHECK_TYPE_SIZE("long long" LONG_LONG)


			




	37
	31
	
		

			




	38
	32
	
		
ENABLE_TESTING()

			




        

    

    

    

        

            

                

                    cmake/FindGLPK.cmake
                

                

                  
                  
                  
                  Show white space
                  8 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -12,9 +12,16 @@


			




	12
	12
	
		
INCLUDE(FindPackageHandleStandardArgs)


			




	13
	13
	
		
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR)


			




	14
	14
	
		

			




	15
	15
	
		
IF(GLPK_FOUND)


			




	
	16
	
		
  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})


			




	16
	17
	
		
  SET(GLPK_LIBRARIES ${GLPK_LIBRARY})


			




	17
	18
	
		
  SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)


			




	18
	19
	
		
ENDIF(GLPK_FOUND)


			




	19
	20
	
		

			




	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
                

                

                  
                  
                  
                  Show white space
                  8 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -19,9 +19,9 @@


			




	19
	19
	
		
)


			




	20
	20
	
		

			




	21
	21
	
		
IF(HAVE_GLPK)


			




	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)


			




	25
	25
	
		
    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)


			




	26
	26
	
		
    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)


			




	27
	27
	
		
    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)

			




        

    

    

    

        

            

                

                    test/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  8 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -2,12 +2,8 @@


			




	2
	2
	
		
  ${PROJECT_SOURCE_DIR}


			




	3
	3
	
		
  ${PROJECT_BINARY_DIR}


			




	4
	4
	
		
)


			




	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)


			




	11
	7
	
		

			




	12
	8
	
		
SET(TESTS


			




	13
	9
	
		
  adaptors_test


			




        

    






    
    



    


    

     
    
0 comments (0 inline)