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

Diff for /imach/CMakeLists.txt between versions 1.1 and 1.3

version 1.1, 2015/08/18 16:44:58 version 1.3, 2015/09/03 07:14:02
Line 21  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) Line 21  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
   
 CONFIGURE_FILE(  CONFIGURE_FILE(
   "${PROJECT_SOURCE_DIR}/version.h.in"    "${PROJECT_SOURCE_DIR}/version.h.in"
   "${PROJECT_BINARY_DIR}/version.h"    "${PROJECT_SOURCE_DIR}/src/version.h"
   )    )
 CONFIGURE_FILE(  CONFIGURE_FILE(
   "${PROJECT_SOURCE_DIR}/config.h.in"    "${PROJECT_SOURCE_DIR}/config.h.in"
Line 36  ADD_SUBDIRECTORY(html) Line 36  ADD_SUBDIRECTORY(html)
 ADD_SUBDIRECTORY(src)  ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(distributions)  ADD_SUBDIRECTORY(distributions)
 #if (${WIN32})  #if (${WIN32})
   #if(APPLE)
   #  set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
   #endif()
 if(UNIX)  if(UNIX)
   #   set(CMAKE_CXX_COMPILER "gcc")    #   set(CMAKE_CXX_COMPILER "gcc")
   target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m)    target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m)
Line 48  if(UNIX) Line 51  if(UNIX)
   set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")    set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
 endif()  endif()
 if(MSVC)  if(MSVC)
     set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
Line 137  INCLUDE(CPack) Line 141  INCLUDE(CPack)
 # else()  # else()
 #   set(VERSION_PATCH "${BUILD_VERSION_PATCH}")  #   set(VERSION_PATCH "${BUILD_VERSION_PATCH}")
 # ENDIF()  # ENDIF()
   file( GLOB_RECURSE parameter_files RELATIVE
   "${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" )
   foreach( parameter_file ${parameter_files} )
     add_custom_command(
       OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
       COMMAND cmake -E copy
   "${CMAKE_CURRENT_SOURCE_DIR}/${parameter_file}"
   "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
       DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${parameter_file}"
     )
     list( APPEND parameter_files_dest "${parameter_file}" )
   endforeach( parameter_file )
   
   #add_custom_target( CopyParameter ALL DEPENDS ${parameter_files_dest} )
 ENABLE_TESTING()  ENABLE_TESTING()
 SUBDIRS(html/doc)  ADD_SUBDIRECTORY(html/doc)
 SUBDIRS(html/doc/data)  ADD_SUBDIRECTORY(html/doc/data)
   install(FILES "${PROJECT_SOURCE_DIR}/html/doc/mypar.imach" DESTINATION "html/doc/mypar.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")
Removed from v.1.1  
changed lines
  Added in v.1.3

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