[BACK]Return to CMakeLists.txt CVS log [TXT] [DIR] Up to [Local Repository] / imach

Diff for /imach/CMakeLists.txt between versions 1.4 and 1.13

version 1.4, 2015/09/03 07:53:42 version 1.13, 2016/07/21 08:45:58
Line 6 Line 6
 #      FORCE)  #      FORCE)
 #  endif()  #  endif()
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)  # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
   set(PACKAGE_NAME "imach")
 SET(IMACH_VERSION_MAJOR 0)  SET(IMACH_VERSION_MAJOR 0)
 SET(IMACH_VERSION_MINOR 98q5)  SET(IMACH_VERSION_MINOR 99r8)
 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})
   SET(@APPNAME@ IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
   SET(@NOTINNOREG@ )
   SET(@NOREG@ )
   SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)
   SET(@APPCOMPILATIONMODE@ icl)
   SET(@VERSION@ ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
   SET(@GNUPLOTVERSION@ 5.1)
   SET(@INFOBEFOREFILE@ README.txt)
   SET(@LICENSEFILE@ Copying)
   SET(@PACKAGE@ imach)
   SET(@DICTLANG@ en)
   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) 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 27  CONFIGURE_FILE( Line 41  CONFIGURE_FILE(
   "${PROJECT_SOURCE_DIR}/config.h.in"    "${PROJECT_SOURCE_DIR}/config.h.in"
   "${PROJECT_BINARY_DIR}/config.h"    "${PROJECT_BINARY_DIR}/config.h"
 )  )
   # Examples for the documentation
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/mypar.imach.in" "html/doc/mypar.imach")  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/mypar.imach.in" "html/doc/mypar.imach")
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/biaspar.imach.in" "html/doc/biaspar.imach")  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/biaspar.imach.in" "html/doc/biaspar.imach")
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data1.txt" "html/doc/data1.txt" COPYONLY)  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data1.txt" "html/doc/data1.txt" COPYONLY)
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/mydata.txt" "html/doc/data/mydata.txt" COPYONLY)  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/mydata.txt" "html/doc/data/mydata.txt" COPYONLY)
   # Test files
   CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/data2.txt" "tests/data/data2.txt" COPYONLY)
   CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV2.imach" "tests/testV2.imach" COPYONLY)
   CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV1V2.imach" "tests/testV1V2.imach" COPYONLY)
   
   
 set (imach_SRCS ./src/imach.c)  set (imach_SRCS ./src/imach.c)
 SET( CMAKE_VERBOSE_MAKEFILE on )  SET( CMAKE_VERBOSE_MAKEFILE on )
Line 72  install(FILES "html/doc/biaspar.imach" D Line 92  install(FILES "html/doc/biaspar.imach" D
 install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")  install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")
 #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 164  ENABLE_TESTING() Line 185  ENABLE_TESTING()
 ADD_SUBDIRECTORY(html/doc)  ADD_SUBDIRECTORY(html/doc)
 ADD_SUBDIRECTORY(html/doc/data)  ADD_SUBDIRECTORY(html/doc/data)
 install(FILES "${PROJECT_SOURCE_DIR}/html/doc/mypar.imach" DESTINATION "html/doc/mypar.imach")  install(FILES "${PROJECT_SOURCE_DIR}/html/doc/mypar.imach" DESTINATION "html/doc/mypar.imach")
   ADD_TEST(testV2.imach  IMaCh-${IMACH_VERSION} tests/testV2.imach )
   ADD_TEST(testV1V2.imach  IMaCh-${IMACH_VERSION} tests/testV1V2.imach )
 ADD_TEST(mypar  IMaCh-${IMACH_VERSION} html/doc/mypar.imach )  ADD_TEST(mypar  IMaCh-${IMACH_VERSION} html/doc/mypar.imach )
 ADD_TEST(biaspar  IMaCh-${IMACH_VERSION} html/doc/biaspar.imach )  ADD_TEST(biaspar  IMaCh-${IMACH_VERSION} html/doc/biaspar.imach )
 #SET(FAB "po" CACHE STRING "Some user-specified option")  #SET(FAB "po" CACHE STRING "Some user-specified option")
Line 219  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(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()  
   
   if(UNIX)
     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()
   endif()
Removed from v.1.4  
changed lines
  Added in v.1.13

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