Diff for /imach/CMakeLists.txt between versions 1.21 and 1.23

version 1.21, 2019/05/21 15:55:06 version 1.23, 2019/05/22 20:20:42
Line 72  if(UNIX) Line 72  if(UNIX)
   set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")    set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
   set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc")    set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc")
   set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests")    set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests")
     set(DATADIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests/data")
   set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man/man1")    set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man/man1")
   #set(EXAMPLE_CONF_DIR ${DOCDIR})    #set(EXAMPLE_CONF_DIR ${DOCDIR})
   set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")    set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
Line 97  install(FILES "src/README.txt" DESTINATI Line 98  install(FILES "src/README.txt" DESTINATI
 install(FILES "distributions/gnulinux/imach.1" DESTINATION "${MANDIR}")  install(FILES "distributions/gnulinux/imach.1" DESTINATION "${MANDIR}")
 install(FILES "distributions/gnulinux/imach.png" DESTINATION "${ICONDIR}")  install(FILES "distributions/gnulinux/imach.png" DESTINATION "${ICONDIR}")
 install(FILES "distributions/gnulinux/imach.desktop" DESTINATION "${XDG_APPS_DIR}")  install(FILES "distributions/gnulinux/imach.desktop" DESTINATION "${XDG_APPS_DIR}")
   install(FILES "tests/testV1V2.imach" DESTINATION "${TESTDIR}")
   install(FILES "tests/rtestV1V2.imach" DESTINATION "${TESTDIR}")
   install(FILES "tests/testV2.imach" DESTINATION "${TESTDIR}")
   install(FILES "tests/rtestV2.imach" DESTINATION "${TESTDIR}")
   install(FILES "tests/data/data2.txt" DESTINATION "${DATADIR}")
 #not working install(FILES "imach.desktop" DESTINATION "${XDG_APPS_DIR}")  #not working install(FILES "imach.desktop" DESTINATION "${XDG_APPS_DIR}")
 #install(FILES "html" DESTINATION "${DOCDIR}")  #install(FILES "html" DESTINATION "${DOCDIR}")
   
Line 108  set(CPACK_PACKAGE_CONTACT "Nicolas Broua Line 114  set(CPACK_PACKAGE_CONTACT "Nicolas Broua
 set(CPACK_PACKAGE_VENDOR "INED")  set(CPACK_PACKAGE_VENDOR "INED")
 SET(CPACK_PACKAGE_VENDOR "IMaCh, INED")  SET(CPACK_PACKAGE_VENDOR "IMaCh, INED")
 SET(CPACK_PACKAGE_LICENSE "GPLv2")  SET(CPACK_PACKAGE_LICENSE "GPLv2")
   #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${IMACH_VERSION_MAJOR}")  SET(CPACK_PACKAGE_VERSION_MAJOR "${IMACH_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${IMACH_VERSION_MINOR}")  SET(CPACK_PACKAGE_VERSION_MINOR "${IMACH_VERSION_MINOR}")
Line 202  INCLUDE(CPack) Line 209  INCLUDE(CPack)
 #   set(VERSION_PATCH "${BUILD_VERSION_PATCH}")  #   set(VERSION_PATCH "${BUILD_VERSION_PATCH}")
 # ENDIF()  # ENDIF()
 file( GLOB_RECURSE parameter_files RELATIVE  file( GLOB_RECURSE parameter_files RELATIVE
 "${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" )  "${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" "tests/*.imach" )
 foreach( parameter_file ${parameter_files} )  foreach( parameter_file ${parameter_files} )
   add_custom_command(    add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
Line 301  if(UNIXDODOXYGEN) Line 308  if(UNIXDODOXYGEN)
   endif (DOXYGEN_FOUND)    endif (DOXYGEN_FOUND)
   message("Doxygen only in UNIX doxygen documentation")    message("Doxygen only in UNIX doxygen documentation")
 endif (UNIXDODOXYGEN)  endif (UNIXDODOXYGEN)
   

Removed from v.1.21  
changed lines
  Added in v.1.23


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