Changeset - r474:f59df77f5c8d
« 473:17d918
476:efec3c »
gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Fix CMAKE build without GLPK
0 3 0
default
3 files changed with 20 insertions and 15 deletions:
demo/CMakeLists.txt
1
lemon/CMakeLists.txt
6
7
test/CMakeLists.txt
14
7
↑ Collapse diff ↑
demo/CMakeLists.txt
Ignore white space 6 line context
... ... 
@@ -3,3 +3,2 @@
3 3 
  ${CMAKE_BINARY_DIR}
4 
  ${GLPK_INCLUDE_DIR}
5 4 
)
lemon/CMakeLists.txt
Ignore white space 6 line context
... ... 
@@ -3,3 +3,2 @@
3 3 
  ${CMAKE_BINARY_DIR}
4 
  ${GLPK_INCLUDE_DIR}
5 4 
)
... ... 
@@ -21,2 +20,8 @@
21 20 
  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
21 
  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
22 
  IF(WIN32)
23 
    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
24 
    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
25 
    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
26 
  ENDIF(WIN32)
22 27 
ENDIF(HAVE_GLPK)
... ... 
@@ -35,7 +40,1 @@
35 40 
  FILES_MATCHING PATTERN "*.h")
36 

			




	37
	
	
		
IF(WIN32)


			




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


			




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


			




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


			




	41
	
	
		
ENDIF(WIN32)

			




        

    

    

    

        

            

                

                    test/CMakeLists.txt
                

                

                  
                  
                  
                  Ignore white space
                  2 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -3,5 +3,8 @@


			




	3
	3
	
		
  ${CMAKE_BINARY_DIR}


			




	4
	
	
		
  ${GLPK_INCLUDE_DIR}


			




	5
	4
	
		
)


			




	6
	5
	
		

			




	
	6
	
		
IF(HAVE_GLPK)


			




	
	7
	
		
  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})


			




	
	8
	
		
ENDIF(HAVE_GLPK)


			




	
	9
	
		

			




	7
	10
	
		
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)


			




	...
	...
	
		
@@ -37,6 +40,8 @@


			




	37
	40
	
		
  ADD_EXECUTABLE(lp_test lp_test.cc)


			




	38
	
	
		
  TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})


			




	
	41
	
		
  IF(HAVE_GLPK)


			




	
	42
	
		
    TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})


			




	
	43
	
		
  ENDIF(HAVE_GLPK)


			




	39
	44
	
		
  ADD_TEST(lp_test lp_test)


			




	40
	45
	
		

			




	41
	
	
		
  IF(WIN32)


			




	
	46
	
		
  IF(WIN32 AND HAVE_GLPK)


			




	42
	47
	
		
    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)


			




	...
	...
	
		
@@ -48,3 +53,3 @@


			




	48
	53
	
		
    )


			




	49
	
	
		
  ENDIF(WIN32)


			




	
	54
	
		
  ENDIF(WIN32 AND HAVE_GLPK)


			




	50
	55
	
		
ENDIF(HAVE_LP)


			




	...
	...
	
		
@@ -53,6 +58,8 @@


			




	53
	58
	
		
  ADD_EXECUTABLE(mip_test mip_test.cc)


			




	54
	
	
		
  TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})


			




	
	59
	
		
  IF(HAVE_GLPK)


			




	
	60
	
		
    TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})


			




	
	61
	
		
  ENDIF(HAVE_GLPK)


			




	55
	62
	
		
  ADD_TEST(mip_test mip_test)


			




	56
	63
	
		

			




	57
	
	
		
  IF(WIN32)


			




	
	64
	
		
  IF(WIN32 AND HAVE_GLPK)


			




	58
	65
	
		
    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)


			




	...
	...
	
		
@@ -64,3 +71,3 @@


			




	64
	71
	
		
    )


			




	65
	
	
		
  ENDIF(WIN32)


			




	
	72
	
		
  ENDIF(WIN32 AND HAVE_GLPK)


			




	66
	73
	
		
ENDIF(HAVE_MIP)


			




        

    






    
    



    


    

     
    
0 comments (0 inline)