]> Creatis software - crea.git/commitdiff
Feature #1711 CreaDevManager application implementation
authorunknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Mon, 11 Feb 2013 15:27:47 +0000 (16:27 +0100)
committerunknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Mon, 11 Feb 2013 15:27:47 +0000 (16:27 +0100)
Merge remote-tracking branch 'refs/remotes/origin/creaDevManager'

Conflicts:
appli/creaNewProject/NewProject/CMakeLists.txt.in (solved)
lib/creaDevManagerLib/CDMUtilities.cpp (solved)
lib/creaDevManagerLib/CDMUtilities.h (solved)
lib/creaDevManagerLib/modelCDMMain.cpp (solved)
lib/creaDevManagerLib/wxCDMMainFrame.cpp (solved)

1  2 
appli/creaDevManager/CMakeLists.txt

index bec75cdd6466807b6fc894381e5f58cf37892903,2caa03c4d2db4356f3148d9e6897824ef1dcbb2c..8eca8df1d75fd320be4be6b5e71e2edf81889ebd
@@@ -1,7 -1,7 +1,7 @@@
  # ---------------------------------------------------------------------
  #
  # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
 -#                        pour la Sant)
 +#                        pour la Santé)
  # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
  # Previous Authors : Laurent Guigues, Jean-Pierre Roux
  # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
@@@ -71,3 -71,40 +71,40 @@@ SET ( ${EXE_NAME}_LINK_LIBRARIE
  #-Creates and installs the exe-----------------------------------------------
  CREA_ADD_EXECUTABLE( ${EXE_NAME} )
  #============================================================================
+ #==sets additional files=====================================================
+ IF(WIN32)
+ # Build tree 
+   CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/about.html
+     ${EXECUTABLE_OUTPUT_PATH}/Debug/about.html
+     COPYONLY 
+     )
+     
+   CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/about.html
+     ${EXECUTABLE_OUTPUT_PATH}/Release/about.html
+     COPYONLY 
+     )
+     
+   INSTALL(
+     PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/Debug/about.html
+     DESTINATION bin
+     )
+ ELSE(WIN32)
+ CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/about.html
+     ${EXECUTABLE_OUTPUT_PATH}/about.html
+     @ONLY IMMEDIATE
+     )
+ INSTALL(
+     FILES ${EXECUTABLE_OUTPUT_PATH}/about.html
+     DESTINATION bin
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+     )
+     
+ ENDIF(WIN32)