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

version 1.6, 2015/09/17 06:19:29 version 1.11, 2015/12/16 09:07:10
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 98r4)
 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 95  install(FILES "html/doc/data1.txt" DESTI Line 95  install(FILES "html/doc/data1.txt" DESTI
   
 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 242  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(UNIX)
 if(DOXYGEN_FOUND)    find_package(Doxygen)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/latex/Doxyfile.in    if(DOXYGEN_FOUND)
 ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile @ONLY)      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/latex/Doxyfile.in
 add_custom_target(doc        ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile @ONLY)
 ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile      add_custom_target(doc
 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile
 COMMENT "Generating IMaCh documentation with Doxygen" VERBATIM        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex
 )        COMMENT "Generating IMaCh documentation with Doxygen" VERBATIM
         )
     endif()
 endif()  endif()
   

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


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