Changeset - r1119:1818cc848005
« 1113:53c0dd
1120:ee581a »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Update CPLEX lookup - References to explicit CPLEX version 9.1 have been removed - Library file name must either be 'cplex.a' or 'cplex.dll'
0 2 0
default
2 files changed with 11 insertions and 9 deletions:
cmake/FindCPLEX.cmake
9
7
test/CMakeLists.txt
2
2
↑ Collapse diff ↑
cmake/FindCPLEX.cmake
Ignore white space 6 line context
... ... 
@@ -2,23 +2,25 @@
2 2 

			




	3
	3
	
		
FIND_PATH(CPLEX_INCLUDE_DIR


			




	4
	4
	
		
  ilcplex/cplex.h


			




	5
	
	
		
  PATHS "C:/ILOG/CPLEX91/include"


			




	6
	
	
		
  PATHS "/opt/ilog/cplex91/include"


			




	
	5
	
		
  PATHS "C:/ILOG/CPLEX/include"


			




	
	6
	
		
  PATHS "/opt/ilog/cplex/include"


			




	7
	7
	
		
  HINTS ${CPLEX_ROOT_DIR}/include


			




	8
	8
	
		
)


			




	9
	9
	
		
FIND_LIBRARY(CPLEX_LIBRARY


			




	10
	
	
		
  cplex91


			




	11
	
	
		
  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"


			




	12
	
	
		
  PATHS "/opt/ilog/cplex91/bin"


			




	
	10
	
		
  cplex


			




	
	11
	
		
  PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda"


			




	
	12
	
		
  PATHS "/opt/ilog/cplex/bin"


			




	13
	13
	
		
  HINTS ${CPLEX_ROOT_DIR}/bin


			




	
	14
	
		
  HINTS ${CPLEX_ROOT_DIR}/lib


			




	14
	15
	
		
)


			




	15
	16
	
		

			




	16
	17
	
		
INCLUDE(FindPackageHandleStandardArgs)


			




	17
	18
	
		
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR)


			




	18
	19
	
		

			




	19
	20
	
		
FIND_PATH(CPLEX_BIN_DIR


			




	20
	
	
		
  cplex91.dll


			




	21
	
	
		
  PATHS "C:/ILOG/CPLEX91/bin/x86_win32"


			




	
	21
	
		
  cplex.dll


			




	
	22
	
		
  PATHS "C:/ILOG/CPLEX/bin/x86_win32"


			




	
	23
	
		
  HINTS ${CPLEX_ROOT_DIR}/bin


			




	22
	24
	
		
)


			




	23
	25
	
		

			




	24
	26
	
		
IF(CPLEX_FOUND)

			




        

    

    

    

        

            

                

                    test/CMakeLists.txt
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -82,7 +82,7 @@


			




	82
	82
	
		
    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)


			




	83
	83
	
		
    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)


			




	84
	84
	
		
    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD


			




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


			




	
	85
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}


			




	86
	86
	
		
    )


			




	87
	87
	
		
  ENDIF()


			




	88
	88
	
		
ENDIF()


			




	...
	...
	
		
@@ -124,7 +124,7 @@


			




	124
	124
	
		
    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)


			




	125
	125
	
		
    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)


			




	126
	126
	
		
    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD


			




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


			




	
	127
	
		
      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}


			




	128
	128
	
		
    )


			




	129
	129
	
		
  ENDIF()


			




	130
	130
	
		
ENDIF()


			




        

    






    
    



    


    

     
    
0 comments (0 inline)