--- imach/CMakeLists.txt 2015/09/15 17:57:21 1.5 +++ imach/CMakeLists.txt 2015/12/16 09:07:10 1.11 @@ -6,8 +6,9 @@ # FORCE) # endif() # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE) +set(PACKAGE_NAME "imach") SET(IMACH_VERSION_MAJOR 0) -SET(IMACH_VERSION_MINOR 98r0) +SET(IMACH_VERSION_MINOR 98r4) SET(IMACH_VERSION_PATCH 0) SET(IMACH_VERSION_NOTE "") SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) @@ -17,13 +18,13 @@ 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@ 4.6) +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) - 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}) #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}") @@ -91,9 +92,10 @@ install(FILES "html/doc/biaspar.imach" D install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}") #install(FILES "html" DESTINATION "${DOCDIR}") + set(CPACK_PACKAGE_VERSION ${IMACH_VERSION}) -set(CPACK_PACKAGE_NAME "IMaCh") -set(CPACK_PACKAGE_RELEASE 2) +set(CPACK_PACKAGE_NAME "imach") +set(CPACK_PACKAGE_RELEASE 1) set(CPACK_PACKAGE_CONTACT "Nicolas Brouard") set(CPACK_PACKAGE_VENDOR "INED") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IMaCh Interpolated Markov Chain program") @@ -240,13 +242,15 @@ ADD_TEST(biaspar IMaCh-${IMACH_VERSION} # endif() # endif() # 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 -) +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() \ No newline at end of file