gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Fix CMAKE build without GLPK
0 3 0
default
3 files changed with 18 insertions and 13 deletions:
↑ Collapse diff ↑
Show white space 4 line context
... ...
@@ -2,5 +2,4 @@
2 2
  ${CMAKE_SOURCE_DIR}
3 3
  ${CMAKE_BINARY_DIR}
4
  ${GLPK_INCLUDE_DIR}
5 4
)
6 5

	
Show white space 4 line context
... ...
@@ -2,5 +2,4 @@
2 2
  ${CMAKE_SOURCE_DIR}
3 3
  ${CMAKE_BINARY_DIR}
4
  ${GLPK_INCLUDE_DIR}
5 4
)
6 5

	
... ...
@@ -20,4 +19,10 @@
20 19
IF(HAVE_GLPK)
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)
23 28

	
... ...
@@ -34,8 +39,2 @@
34 39
  COMPONENT headers
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)
Show white space 4 line context
... ...
@@ -2,7 +2,10 @@
2 2
  ${CMAKE_SOURCE_DIR}
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)
8 11

	
... ...
@@ -36,8 +39,10 @@
36 39
IF(HAVE_LP)
37 40
  ADD_EXECUTABLE(lp_test lp_test.cc)
41
  IF(HAVE_GLPK)
38 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)
43 48
    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
... ...
@@ -47,13 +52,15 @@
47 52
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
48 53
    )
49
  ENDIF(WIN32)
54
  ENDIF(WIN32 AND HAVE_GLPK)
50 55
ENDIF(HAVE_LP)
51 56

	
52 57
IF(HAVE_MIP)
53 58
  ADD_EXECUTABLE(mip_test mip_test.cc)
59
  IF(HAVE_GLPK)
54 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)
59 66
    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
... ...
@@ -63,5 +70,5 @@
63 70
      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
64 71
    )
65
  ENDIF(WIN32)
72
  ENDIF(WIN32 AND HAVE_GLPK)
66 73
ENDIF(HAVE_MIP)
67 74

	
0 comments (0 inline)