Changeset - r555:861a9d5ff283
« 503:64c264
« 554:e6ae49
559:9b9ffe »
556:c59196 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge (manually add cmake/FindGLPK.cmake to Makefile.am)
0 4 1
merge default
3 files changed with 39 insertions and 34 deletions:
cmake/version.cmake.in
2
CMakeLists.txt
29
32
Makefile.am
6
1
cmake/nsis/lemon.ico
bin
bin
configure.ac
2
1
↑ Collapse diff ↑
cmake/version.cmake.in
Ignore white space 6 line context
1 
SET(PROJECT_NAME "@PACKAGE_NAME@")
2 
SET(PROJECT_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.")
CMakeLists.txt
Ignore white space 8 line context
1 1 
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
2 2 

			




	3
	
	
		
SET(PROJECT_NAME "LEMON")


			




	4
	
	
		
SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.")


			




	
	3
	
		
IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)


			




	
	4
	
		
  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake)


			




	
	5
	
		
ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)


			




	
	6
	
		
  SET(PROJECT_NAME "LEMON")


			




	
	7
	
		
  SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.")


			




	
	8
	
		
ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)


			




	5
	9
	
		

			




	6
	10
	
		
PROJECT(${PROJECT_NAME})


			




	7
	11
	
		

			




	8
	12
	
		
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)


			




	...
	...
	
		
@@ -35,16 +39,10 @@


			




	35
	39
	
		
ADD_SUBDIRECTORY(doc)


			




	36
	40
	
		
ADD_SUBDIRECTORY(test)


			




	37
	41
	
		

			




	38
	42
	
		
IF(WIN32)


			




	39
	
	
		
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico


			




	40
	
	
		
    DESTINATION bin)


			




	41
	
	
		
ENDIF(WIN32)


			




	42
	
	
		

			




	43
	
	
		
IF(WIN32)


			




	44
	43
	
		
  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})


			




	45
	
	
		
  SET(CPACK_PACKAGE_VENDOR


			




	46
	
	
		
    "EGRES - Egervary Research Group on Combinatorial Optimization")


			




	
	44
	
		
  SET(CPACK_PACKAGE_VENDOR "EGRES")


			




	47
	45
	
		
  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY


			




	48
	46
	
		
    "LEMON - Library of Efficient Models and Optimization in Networks")


			




	49
	47
	
		
  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")


			




	50
	48
	
		

			




	...
	...
	
		
@@ -54,38 +52,37 @@


			




	54
	52
	
		
    "${PROJECT_NAME} ${PROJECT_VERSION}")


			




	55
	53
	
		
  SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY


			




	56
	54
	
		
    "${PROJECT_NAME} ${PROJECT_VERSION}")


			




	57
	55
	
		

			




	58
	
	
		
  # Variables to generate a component-based installer.


			




	59
	
	
		
  #SET(CPACK_COMPONENTS_ALL headers library html_documentation)


			




	
	56
	
		
  SET(CPACK_COMPONENTS_ALL headers library html_documentation)


			




	60
	57
	
		

			




	61
	
	
		
  #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")


			




	62
	
	
		
  #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library")


			




	63
	
	
		
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")


			




	
	58
	
		
  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")


			




	
	59
	
		
  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")


			




	
	60
	
		
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")


			




	64
	61
	
		

			




	65
	
	
		
  #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION


			




	66
	
	
		
  #  "C++ header files for use with the LEMON library")


			




	67
	
	
		
  #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION


			




	68
	
	
		
  #  "Static library used to build programs with LEMON")


			




	69
	
	
		
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION


			




	70
	
	
		
  #  "Doxygen generated documentation")


			




	
	62
	
		
  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION


			




	
	63
	
		
    "C++ header files")


			




	
	64
	
		
  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION


			




	
	65
	
		
    "DLL and import library")


			




	
	66
	
		
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION


			




	
	67
	
		
    "Doxygen generated documentation")


			




	71
	68
	
		

			




	72
	
	
		
  #SET(CPACK_COMPONENT_HEADERS_DEPENDS library)


			




	
	69
	
		
  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)


			




	73
	70
	
		

			




	74
	
	
		
  #SET(CPACK_COMPONENT_HEADERS_GROUP "Development")


			




	75
	
	
		
  #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")


			




	76
	
	
		
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")


			




	
	71
	
		
  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")


			




	
	72
	
		
  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")


			




	
	73
	
		
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")


			




	77
	74
	
		

			




	78
	
	
		
  #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION


			




	79
	
	
		
  #  "Components needed to develop software using LEMON")


			




	80
	
	
		
  #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION


			




	81
	
	
		
  #  "Documentation of LEMON")


			




	
	75
	
		
  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION


			




	
	76
	
		
    "Components needed to develop software using LEMON")


			




	
	77
	
		
  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION


			




	
	78
	
		
    "Documentation of LEMON")


			




	82
	79
	
		

			




	83
	
	
		
  #SET(CPACK_ALL_INSTALL_TYPES Full Developer)


			




	
	80
	
		
  SET(CPACK_ALL_INSTALL_TYPES Full Developer)


			




	84
	81
	
		

			




	85
	
	
		
  #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)


			




	86
	
	
		
  #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)


			




	87
	
	
		
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)


			




	
	82
	
		
  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)


			




	
	83
	
		
  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)


			




	
	84
	
		
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)


			




	88
	85
	
		

			




	89
	86
	
		
  SET(CPACK_GENERATOR "NSIS")


			




	90
	87
	
		
  SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")


			




	91
	88
	
		
  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")

			




        

    

    

    

        

            

                

                    Makefile.am
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -11,9 +11,14 @@


			




	11
	11
	
		
	m4/lx_check_cplex.m4 \


			




	12
	12
	
		
	m4/lx_check_glpk.m4 \


			




	13
	13
	
		
	m4/lx_check_soplex.m4 \


			




	14
	14
	
		
	CMakeLists.txt \


			




	15
	
	
		
	cmake


			




	
	15
	
		
	cmake/FindGhostscript.cmake \


			




	
	16
	
		
	cmake/FindGLPK.cmake \


			




	
	17
	
		
	cmake/version.cmake.in \


			




	
	18
	
		
	cmake/version.cmake \


			




	
	19
	
		
	cmake/nsis/lemon.ico \


			




	
	20
	
		
	cmake/nsis/uninstall.ico


			




	16
	21
	
		

			




	17
	22
	
		
pkgconfigdir = $(libdir)/pkgconfig


			




	18
	23
	
		
lemondir = $(pkgincludedir)


			




	19
	24
	
		
bitsdir = $(lemondir)/bits

			




        

    

    

    

        

            

                

                    cmake/nsis/lemon.ico
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	
	
	
		
modified binary file

			




        

    

    

    

        

            

                

                    configure.ac
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -99,12 +99,13 @@


			




	99
	99
	
		
AC_CHECK_FUNCS(gettimeofday times ctime_r)


			




	100
	100
	
		

			




	101
	101
	
		
dnl Add dependencies on files generated by configure.


			




	102
	102
	
		
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],


			




	103
	
	
		
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in'])


			




	
	103
	
		
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])


			




	104
	104
	
		

			




	105
	105
	
		
AC_CONFIG_FILES([


			




	106
	106
	
		
Makefile


			




	
	107
	
		
cmake/version.cmake


			




	107
	108
	
		
doc/Doxyfile


			




	108
	109
	
		
lemon/lemon.pc


			




	109
	110
	
		
])


			




	110
	111
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)