Changeset - r679:9c7639f3a741
« 678:d1e1cd
680:257e91 »
gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Minor CMake improvements * Use the empty ELSE(), ENDIF(), ENDMACRO(), etc. syntax since this improves readability and requires less typing. * Use FIND_PACKAGE() instead of INCLUDE(). * Use the value of CMAKE_COMMAND variable instead of cmake, since this works even if cmake is not in the PATH.
0 6 0
default
6 files changed with 58 insertions and 45 deletions:
CMakeLists.txt
6
8
demo/CMakeLists.txt
6
3
doc/CMakeLists.txt
2
2
lemon/CMakeLists.txt
6
6
test/CMakeLists.txt
32
23
tools/CMakeLists.txt
6
3
↑ Collapse diff ↑
CMakeLists.txt
Show white space 2 line context
... ... 
@@ -24,4 +24,4 @@
24 24 

			




	25
	
	
		
INCLUDE(FindDoxygen)


			




	26
	
	
		
INCLUDE(FindGhostscript)


			




	
	25
	
		
FIND_PACKAGE(Doxygen)


			




	
	26
	
		
FIND_PACKAGE(Ghostscript)


			




	27
	27
	
		
FIND_PACKAGE(GLPK 4.33)


			




	...
	...
	
		
@@ -42,3 +42,3 @@


			




	42
	42
	
		
  ADD_SUBDIRECTORY(test)


			




	43
	
	
		
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})


			




	
	43
	
		
ENDIF()


			




	44
	44
	
		

			




	...
	...
	
		
@@ -59,6 +59,5 @@


			




	59
	59
	
		
  )


			




	60
	
	
		
ENDIF(UNIX)


			




	
	60
	
		
ENDIF()


			




	61
	61
	
		

			




	62
	
	
		
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})


			




	63
	
	
		
  IF(WIN32)


			




	
	62
	
		
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} AND WIN32)


			




	64
	63
	
		
    SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})


			




	...
	...
	
		
@@ -127,3 +126,2 @@


			




	127
	126
	
		
    INCLUDE(CPack)


			




	128
	
	
		
  ENDIF(WIN32)


			




	129
	
	
		
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})


			




	
	127
	
		
ENDIF()

			




        

    

    

    

        

            

                

                    demo/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  2 line context
                

                
                  
                
            

        

        

            

            



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


			




	5
	5
	
		

			




	6
	
	
		
LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)


			




	
	6
	
		
LINK_DIRECTORIES(


			




	
	7
	
		
  ${PROJECT_BINARY_DIR}/lemon


			




	
	8
	
		
)


			




	7
	9
	
		

			




	...
	...
	
		
@@ -10,3 +12,4 @@


			




	10
	12
	
		
  graph_to_eps_demo


			




	11
	
	
		
  lgf_demo)


			




	
	13
	
		
  lgf_demo


			




	
	14
	
		
)


			




	12
	15
	
		

			




	...
	...
	
		
@@ -15,2 +18,2 @@


			




	15
	18
	
		
  TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)


			




	16
	
	
		
ENDFOREACH(DEMO_NAME)


			




	
	19
	
		
ENDFOREACH()

			




        

    

    

    

        

            

                

                    doc/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  2 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -48,4 +48,4 @@


			




	48
	48
	
		
    )


			




	49
	
	
		
  ENDIF(UNIX)


			




	
	49
	
		
  ENDIF()


			




	50
	50
	
		

			




	51
	
	
		
ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)


			




	
	51
	
		
ENDIF()

			




        

    

    

    

        

            

                

                    lemon/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  2 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -27,4 +27,4 @@


			




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


			




	28
	
	
		
  ENDIF(WIN32)


			




	29
	
	
		
ENDIF(LEMON_HAVE_GLPK)


			




	
	28
	
		
  ENDIF()


			




	
	29
	
		
ENDIF()


			




	30
	30
	
		

			




	...
	...
	
		
@@ -33,3 +33,3 @@


			




	33
	33
	
		
  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})


			




	34
	
	
		
ENDIF(LEMON_HAVE_CPLEX)


			




	
	34
	
		
ENDIF()


			




	35
	35
	
		

			




	...
	...
	
		
@@ -38,3 +38,3 @@


			




	38
	38
	
		
  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})


			




	39
	
	
		
ENDIF(LEMON_HAVE_CLP)


			




	
	39
	
		
ENDIF()


			




	40
	40
	
		

			




	...
	...
	
		
@@ -43,3 +43,3 @@


			




	43
	43
	
		
  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})


			




	44
	
	
		
ENDIF(LEMON_HAVE_CBC)


			




	
	44
	
		
ENDIF()


			




	45
	45
	
		

			




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


			




	48
	48
	
		
  SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)


			




	49
	
	
		
ENDIF(UNIX)


			




	
	49
	
		
ENDIF()


			




	50
	50
	
		

			




        

    

    

    

        

            

                

                    test/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  2 line context
                

                
                  
                
            

        

        

            

            



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


			




	5
	5
	
		

			




	6
	
	
		
LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)


			




	
	6
	
		
LINK_DIRECTORIES(


			




	
	7
	
		
  ${PROJECT_BINARY_DIR}/lemon


			




	
	8
	
		
)


			




	7
	9
	
		

			




	...
	...
	
		
@@ -37,3 +39,4 @@


			




	37
	39
	
		
  time_measure_test


			




	38
	
	
		
  unionfind_test)


			




	
	40
	
		
  unionfind_test


			




	
	41
	
		
)


			




	39
	42
	
		

			




	...
	...
	
		
@@ -42,11 +45,13 @@


			




	42
	45
	
		
  SET(LP_TEST_LIBS lemon)


			




	
	46
	
		

			




	43
	47
	
		
  IF(LEMON_HAVE_GLPK)


			




	44
	48
	
		
    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})


			




	45
	
	
		
  ENDIF(LEMON_HAVE_GLPK)


			




	
	49
	
		
  ENDIF()


			




	46
	50
	
		
  IF(LEMON_HAVE_CPLEX)


			




	47
	51
	
		
    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})


			




	48
	
	
		
  ENDIF(LEMON_HAVE_CPLEX)


			




	
	52
	
		
  ENDIF()


			




	49
	53
	
		
  IF(LEMON_HAVE_CLP)


			




	50
	54
	
		
    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})


			




	51
	
	
		
  ENDIF(LEMON_HAVE_CLP)


			




	
	55
	
		
  ENDIF()


			




	
	56
	
		

			




	52
	57
	
		
  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})


			




	...
	...
	
		
@@ -58,7 +63,8 @@


			




	58
	63
	
		
    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD


			




	59
	
	
		
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}


			




	60
	
	
		
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}


			




	61
	
	
		
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}


			




	
	64
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}


			




	
	65
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}


			




	
	66
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}


			




	62
	67
	
		
    )


			




	63
	
	
		
  ENDIF(WIN32 AND LEMON_HAVE_GLPK)


			




	
	68
	
		
  ENDIF()


			




	
	69
	
		

			




	64
	70
	
		
  IF(WIN32 AND LEMON_HAVE_CPLEX)


			




	...
	...
	
		
@@ -67,6 +73,6 @@


			




	67
	73
	
		
    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD


			




	68
	
	
		
      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}


			




	
	74
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}


			




	69
	75
	
		
    )


			




	70
	
	
		
  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)


			




	71
	
	
		
ENDIF(LEMON_HAVE_LP)


			




	
	76
	
		
  ENDIF()


			




	
	77
	
		
ENDIF()


			




	72
	78
	
		

			




	...
	...
	
		
@@ -75,11 +81,13 @@


			




	75
	81
	
		
  SET(MIP_TEST_LIBS lemon)


			




	
	82
	
		

			




	76
	83
	
		
  IF(LEMON_HAVE_GLPK)


			




	77
	84
	
		
    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})


			




	78
	
	
		
  ENDIF(LEMON_HAVE_GLPK)


			




	
	85
	
		
  ENDIF()


			




	79
	86
	
		
  IF(LEMON_HAVE_CPLEX)


			




	80
	87
	
		
    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})


			




	81
	
	
		
  ENDIF(LEMON_HAVE_CPLEX)


			




	
	88
	
		
  ENDIF()


			




	82
	89
	
		
  IF(LEMON_HAVE_CBC)


			




	83
	90
	
		
    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})


			




	84
	
	
		
  ENDIF(LEMON_HAVE_CBC)


			




	
	91
	
		
  ENDIF()


			




	
	92
	
		

			




	85
	93
	
		
  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})


			




	...
	...
	
		
@@ -91,7 +99,8 @@


			




	91
	99
	
		
    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD


			




	92
	
	
		
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}


			




	93
	
	
		
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}


			




	94
	
	
		
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}


			




	
	100
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}


			




	
	101
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}


			




	
	102
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}


			




	95
	103
	
		
    )


			




	96
	
	
		
  ENDIF(WIN32 AND LEMON_HAVE_GLPK)


			




	
	104
	
		
  ENDIF()


			




	
	105
	
		

			




	97
	106
	
		
  IF(WIN32 AND LEMON_HAVE_CPLEX)


			




	...
	...
	
		
@@ -100,6 +109,6 @@


			




	100
	109
	
		
    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD


			




	101
	
	
		
      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}


			




	
	110
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}


			




	102
	111
	
		
    )


			




	103
	
	
		
  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)


			




	104
	
	
		
ENDIF(LEMON_HAVE_MIP)


			




	
	112
	
		
  ENDIF()


			




	
	113
	
		
ENDIF()


			




	105
	114
	
		

			




	...
	...
	
		
@@ -109,2 +118,2 @@


			




	109
	118
	
		
  ADD_TEST(${TEST_NAME} ${TEST_NAME})


			




	110
	
	
		
ENDFOREACH(TEST_NAME)


			




	
	119
	
		
ENDFOREACH()

			




        

    

    

    

        

            

                

                    tools/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  2 line context
                

                
                  
                
            

        

        

            

            



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


			




	5
	5
	
		

			




	6
	
	
		
LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)


			




	
	6
	
		
LINK_DIRECTORIES(


			




	
	7
	
		
  ${PROJECT_BINARY_DIR}/lemon


			




	
	8
	
		
)


			




	7
	9
	
		

			




	...
	...
	
		
@@ -26,3 +28,4 @@


			




	26
	28
	
		
    DESTINATION bin


			




	27
	
	
		
    COMPONENT bin)


			




	28
	
	
		
ENDIF(NOT WIN32)


			




	
	29
	
		
    COMPONENT bin


			




	
	30
	
		
  )


			




	
	31
	
		
ENDIF()


			




        

    






    
    



    


    

     
    
0 comments (0 inline)