Diff for /imach/CMakeLists.txt between versions 1.6 and 1.20

version 1.6, 2015/09/17 06:19:29 version 1.20, 2019/05/09 15:04:48
Line 8 Line 8
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)  # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
 set(PACKAGE_NAME "imach")  set(PACKAGE_NAME "imach")
 SET(IMACH_VERSION_MAJOR 0)  SET(IMACH_VERSION_MAJOR 0)
 SET(IMACH_VERSION_MINOR 98r0)  SET(IMACH_VERSION_MINOR 99r18)
 SET(IMACH_VERSION_PATCH 0)  SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")  SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})  SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
Line 18  SET(@NOREG@ ) Line 18  SET(@NOREG@ )
 SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)  SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)
 SET(@APPCOMPILATIONMODE@ icl)  SET(@APPCOMPILATIONMODE@ icl)
 SET(@VERSION@ ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})  SET(@VERSION@ ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
 SET(@GNUPLOTVERSION@ 4.6)  SET(@GNUPLOTVERSION@ 5.1)
 SET(@INFOBEFOREFILE@ README.txt)  SET(@INFOBEFOREFILE@ README.txt)
 SET(@LICENSEFILE@ Copying)  SET(@LICENSEFILE@ Copying)
 SET(@PACKAGE@ imach)  SET(@PACKAGE@ imach)
 SET(@DICTLANG@ en)  SET(@DICTLANG@ en)
 SET(@VERMAJOR@ )  SET(@VERMAJOR@ )
 SET(@COPYRIGHT@ "Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015")  SET(@COPYRIGHT@ "Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) 2013-2016- Intel Software 2015-2018")
 #SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}.${IMACH_VERSION_PATCH})  #SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}.${IMACH_VERSION_PATCH})
 #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")  #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")
   
Line 90  install(FILES "html/doc/mypar.imach" DES Line 90  install(FILES "html/doc/mypar.imach" DES
 install(FILES "html/doc/data/mydata.txt" DESTINATION "${DOCDIR}/data")  install(FILES "html/doc/data/mydata.txt" DESTINATION "${DOCDIR}/data")
 install(FILES "html/doc/biaspar.imach" DESTINATION "${DOCDIR}")  install(FILES "html/doc/biaspar.imach" DESTINATION "${DOCDIR}")
 install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")  install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")
   #not working install(FILES "imach.desktop" DESTINATION "${XDG_APPS_DIR}")
 #install(FILES "html" DESTINATION "${DOCDIR}")  #install(FILES "html" DESTINATION "${DOCDIR}")
   
   
 set(CPACK_PACKAGE_VERSION ${IMACH_VERSION})  set(CPACK_PACKAGE_VERSION ${IMACH_VERSION})
 set(CPACK_PACKAGE_NAME "imach")  set(CPACK_PACKAGE_NAME "imach")
 set(CPACK_PACKAGE_RELEASE 2)  set(CPACK_PACKAGE_RELEASE 1)
 set(CPACK_PACKAGE_CONTACT "Nicolas Brouard")  set(CPACK_PACKAGE_CONTACT "Nicolas Brouard")
 set(CPACK_PACKAGE_VENDOR "INED")  set(CPACK_PACKAGE_VENDOR "INED")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IMaCh Interpolated Markov Chain program")  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IMaCh Interpolated Markov Chain program")
Line 242  ADD_TEST(biaspar  IMaCh-${IMACH_VERSION} Line 243  ADD_TEST(biaspar  IMaCh-${IMACH_VERSION}
 #   endif()  #   endif()
 # endif()  # endif()
 # Add a target to generate API documentation with Doxygen  # Add a target to generate API documentation with Doxygen
 find_package(Doxygen)  
 if(DOXYGEN_FOUND)  
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/latex/Doxyfile.in  
 ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile @ONLY)  
 add_custom_target(doc  
 ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile  
 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex  
 COMMENT "Generating IMaCh documentation with Doxygen" VERBATIM  
 )  
 endif()  
   
   option(BUILD_DOC "Build documentation" ON)
   if(UNIX)
     find_package(Doxygen)
     if(DOXYGEN_FOUND)# set input and output files
       #set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/../docs/Doxyfile.in) ~/Documents/imach/cvs/imach/latex/Doxyfile.in
       set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/latex/Doxyfile.in)
       set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
   
       # request to configure the file
       configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
       message("Doxygen build started")
   
       # note the option ALL which allows to build the docs together with the application
       add_custom_target( doc_doxygen ALL
         COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating API documentation with Doxygen in gnulinux/html/index.html"
         VERBATIM )
       install(DIRECTORY ${CMAKE_BINARY_DIR}/html 
         DESTINATION share/doc/${CMAKE_PROJECT_NAME})
     else (DOXYGEN_FOUND)
       message("Doxygen need to be installed to generate the doxygen documentation")
     endif (DOXYGEN_FOUND)
   else (UNIX)
     message("Doxygen only in UNIX doxygen documentation")
   endif (UNIX)
   

Removed from v.1.6  
changed lines
  Added in v.1.20


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>