]> Creatis software - crea.git/commitdiff
*** empty log message ***
authorJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Wed, 30 Sep 2009 15:53:08 +0000 (15:53 +0000)
committerJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Wed, 30 Sep 2009 15:53:08 +0000 (15:53 +0000)
20 files changed:
appli/creaNewProject/CMakeLists.txt
appli/creaNewProject/NewProject/CMakeLists.txt.in
appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake
appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake
appli/creaNewProject/NewProject/cmake/UserBuildLatexDoc.cmake
appli/creaNewProject/NewProject/cmake/UserConfig.cmake
appli/creaNewProject/NewProject/doc/UserDocumentation/UserDocumentation.tex
appli/creaNewProject/NewProject/doc/config.tex
appli/creaNewProject/NewProject/doc/help_contents.html.in
appli/creaNewProject/NewProject/doc/index-no-frame.html.in
appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt
appli/creaNewProject/NewProject/doc/template_WebSite/install.html
appli/creaNewProject/NewProject/doc/template_WebSite/menu.html
appli/creaNewProject/creaNewProject.bat.in
appli/creaNewProject/creaNewProject.cpp
appli/creaSed/creaSed.cpp
cmake/CREAMacro_FindAndUseLibraries.cmake
cmake/CREAMacro_FindAndUseQt.cmake [new file with mode: 0644]
src/creaSystem.h
src/creaVtk.txx

index 892756f7e0866215f9c8bc427e871589e76d9176..3f138d5128dbff51e85ee37d9fedea90483f5f38 100644 (file)
@@ -24,7 +24,7 @@ IF(WIN32)
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
     ${EXECUTABLE_OUTPUT_PATH}/Debug/xcopy.exe
-    @ONLY IMMEDIATE
+    COPYONLY 
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/creaNewProject.bat.in
@@ -45,7 +45,7 @@ IF(WIN32)
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/xcopy.exe
     ${EXECUTABLE_OUTPUT_PATH}/Release/xcopy.exe
-    @ONLY IMMEDIATE
+    COPYONLY 
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/creaNewProject.bat.in
index c31d3275a93186f6a9c535bee8e7dac215acf6dc..5a90c41581d2c8e7d6dc5d18ff722ef065bb8914 100644 (file)
@@ -8,16 +8,22 @@
 # ---------------------------------
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 ###################################
-PROJECT(PROJECT_NAME)
+SET(PROJECT_NAME "NameOfTheProject")
 ###################################
 
+PROJECT(${PROJECT_NAME})
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
 SET(PROJECT_BUILD_VERSION 0)
+
+SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_BUILD_VERSION}")
+SET(PROJECT_VERSION_DATE "30/09/2009")
+#ADD_DEFINITIONS( -DPROJECT_VERSION=${PROJECT_VERSION} )
+#ADD_DEFINITIONS( -DPROJECT_VERSION_DATE=${PROJECT_VERSION_DATE} )
+
 #==================================
 
 #==================================
@@ -54,13 +60,13 @@ SET(USE_BOOST     OFF)
 # Note : Set USE_DOXYGEN to ON
 #  if you think you will ask, some day, 
 #  for Doxygen generation
-SET(USE_DOXYGEN   OFF)
+#SET(USE_DOXYGEN   OFF)
 
 # Note : Set USE_LATEX to ON, USE_TTH to ON
 #  if you think you will ask, some day, 
 #  for doc generation using your own latex documents
-SET(USE_LATEX     OFF)
-SET(USE_TTH       OFF)
+#SET(USE_LATEX     OFF)
+#SET(USE_TTH       OFF)
 
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
index 38f47331091f9f156107124f1901396902441530..24466711448ca6c14ac112214c1911fe05cb639b 100644 (file)
@@ -9,11 +9,14 @@ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
   SET(DOXYGEN_PROJECT_NAME "${NAME}")
 
   # Inputs
-  STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
+  #STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
 
   # Output dirs
   SET(DOXYGEN_HTML_OUTPUT ".")
-  SET(DOXYGEN_OUTPUT ${${PROJECT_NAME}_DOXYGEN_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH})
+  SET(DOXYGEN_OUTPUT "${${PROJECT_NAME}_DOXYGEN_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}") 
+  STRING(REGEX REPLACE " " "~" DOXYGEN_OUTPUT "${DOXYGEN_OUTPUT}")
+  
   IF(NOT IS_DIRECTORY ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT})
     FILE(MAKE_DIRECTORY ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT})
   ENDIF(NOT IS_DIRECTORY ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT})
@@ -64,8 +67,8 @@ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
     DIRECTORY
     ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}
     DESTINATION
-    ${BBTK_DOXYGEN_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
+    ${${PROJECT_NAME}_DOXYGEN_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
     )
   #--------------------------------------------------------------------------
-
+#message("user build doxygen , doxygen output = ${DOXYGEN_OUTPUT}")
 ENDMACRO(USER_BUILD_DOXYGEN_DOC)
index 5e79304e71d691f840d301025041c88553a7efa5..1cba4365737c68a8b3320dbec74f16e52cb32791 100644 (file)
@@ -5,8 +5,12 @@ MACRO(USER_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH)
   SET(USE_TTH ON CACHE BOOL "" FORCE)
   # Construct absolute build path
   SET(BUILD_PATH ${${PROJECT_NAME}_DOC_BUILD_PATH}/${OUTPUT_REL_PATH})
-  #-------------------------------------------------------------------------
-  
+  #------------------------------------------------------------------------- 
+  IF(WIN32)
+               SET(TTH_EXECUTABLE "${TTH_EXECUTABLE}/tth.exe")
+       ENDIF(WIN32)
+       
+       #message("MACRO(USER_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH) TTH_EXECUTABLE ${TTH_EXECUTABLE}")
   ADD_CUSTOM_COMMAND(
     OUTPUT ${BUILD_PATH}/${TEX_FILE}.html
     COMMAND 
@@ -22,7 +26,7 @@ MACRO(USER_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH)
   # Install
   INSTALL( 
     FILES ${BUILD_PATH}/${TEX_FILE}.html
-    DESTINATION ${BBTK_DOC_INSTALL_PATH}/${OUTPUT_REL_PATH}
+    DESTINATION ${${PROJECT_NAME}_DOC_INSTALL_PATH}/${OUTPUT_REL_PATH}
     )   
   #-------------------------------------------------------------------------
   
index b70ac843bad03c85f01a4233d7c15bc45d6e656a..1f5ad69482d1b0bafdffa0f263a390ef1799e727 100644 (file)
@@ -26,7 +26,9 @@ MACRO(USER_BUILD_LATEX_DOC TEX_FILE OUTPUT_REL_PATH)
  FILE(TO_NATIVE_PATH ${BUILD_PATH} THE_BUILD_PATH)
 
   # Have to run latex twice to get references, toc, etc.
-  ADD_CUSTOM_COMMAND(
+ #message("ADD_CUSTOM_COMMAND(OUTPUT ${BUILD_PATH}/${TEX_FILE}.aux   MACRO(USER_BUILD_LATEX_DOC")
+      
+ADD_CUSTOM_COMMAND(
     OUTPUT ${BUILD_PATH}/${TEX_FILE}.aux 
     COMMAND 
     # latex
@@ -38,7 +40,9 @@ MACRO(USER_BUILD_LATEX_DOC TEX_FILE OUTPUT_REL_PATH)
     ${CMAKE_CURRENT_SOURCE_DIR}/${TEX_FILE}.tex
     ${CMAKE_CURRENT_SOURCE_DIR}/../config.tex
     )
-  ADD_CUSTOM_COMMAND(
+
+#message("LATEX_COMPILER = ${LATEX_COMPILER}")
+ADD_CUSTOM_COMMAND(
     OUTPUT ${BUILD_PATH}/${TEX_FILE}.pdf
     COMMAND 
     # latex
@@ -57,7 +61,6 @@ MACRO(USER_BUILD_LATEX_DOC TEX_FILE OUTPUT_REL_PATH)
   INSTALL( 
     FILES ${BUILD_PATH}/${TEX_FILE}.pdf
     DESTINATION ${${PROJECT_NAME}_DOC_INSTALL_PATH}/${OUTPUT_REL_PATH}
-    )  
-
+    )
 
 ENDMACRO(USER_BUILD_LATEX_DOC)
index 4245d109b3aef6e5292135875cd41bfc339e4520..58dfc687814ce03252c55c6271675ff4b8632a60 100644 (file)
@@ -1,7 +1,6 @@
 
 
 #-----------------------------------------------------------------------------
-# The vars BBTK_DOC_REL_PATH and BBTK_BBS_REL_PATH
 # store documentation and scripts **RELATIVE** paths  
 # from build tree root or install tree root
 # (different on win/lin)
@@ -10,8 +9,8 @@ IF(WIN32)
   SET(${PROJECT_NAME}_SHARE_REL_PATH "bin/..")
   SET(${PROJECT_NAME}_DOC_REL_PATH doc) 
 ELSE(WIN32)
-  SET(${PROJECT_NAME}_SHARE_REL_PATH share/bbtk)
-  SET(${PROJECT_NAME}_DOC_REL_PATH share/bbtk/doc)  
+  SET(${PROJECT_NAME}_SHARE_REL_PATH share/${PROJECT_NAME})
+  SET(${PROJECT_NAME}_DOC_REL_PATH share/${PROJECT_NAME}/doc)  
 ENDIF(WIN32)   
 
 MESSAGE(STATUS "* SHARE_REL_PATH   =${${PROJECT_NAME}_SHARE_REL_PATH}")
index 95105532d440559e7ebc89bc9a8f86dd4c3e7f5d..f49e631637705f59b3f025978ec8ebcf0ad927f5 100644 (file)
@@ -3,47 +3,68 @@
 \documentclass[11pt,final,a4paper]{article}
 \input{config.tex}
 \begin{document}
-\bbtkGuide[Package Developers' Guide]
+\UserDocumentGuide[User Documentation Guide]
 \newpage
 % ==========================================
 
-
-
-
 % ==========================================
 \section{Introduction}
 % ==========================================
-
-Introduction
-
-\begin{enumerate}
-\item \textbf{Subject 1 }
-This is described in section \ref{Section1}.
-
-\item \textbf{Describe your new box.}
-You can do it either :
+Introductory paragraph to the content of the document 
+% ==========================================
+% ==========================================
+\section{Objectives}
+% ==========================================
+\subsection{General Objective}
+% ==========================================
 \begin{itemize}
-\item In \CPP code. You will have to write the class for 
-your box, mostly using \bbtk macros.  
-\item In \xml code. 
-When configuring your project with \cmake, 
-the utility \bbfy will then generate the corresponding \CPP code. 
+\item{\bf Objective 1} General description of the 
+objectives 
 \end{itemize}
-
-This is described in section \ref{CreateBlackBox}.
-
-\end{enumerate}
-
 % ==========================================
-\section{Subject 1}
-\label{Section1}
 % ==========================================
-
+\subsection{Specific Objectives}
 % ==========================================
-\subsection{SubSection 1}
+\begin{itemize}
+\item{\bf Objective 1} Detail description of the 
+objective 
+\item{\bf Objective n} Detail description of the 
+objective
+\end{itemize}
+% ==========================================
+\section{Scope and Vision}
+% ==========================================
+Scope and vision of the system to analyze
+What is the reaching point of the system?
+% ==========================================
+\section{General Description}
+% ==========================================
+General description of the whole module
+% ==========================================
+\section{Requirements List}
+% ==========================================
+\begin{itemize}
+\item{\bf Req1} Description of the 
+requirement
+\item{\bf Reqn} Description of the 
+requirement
+\end{itemize}
+% ==========================================
+\section{Analysis and design of the requirements}
+% ==========================================
+% ==========================================
+\subsection{Req1}
+% ==========================================
+Detailed description of each req
+% ==========================================
+\subsection{Reqn}
+% ==========================================
+% ==========================================
+\section{Glosary}
+% ==========================================
+% ==========================================
+\section{Anexes}
 % ==========================================
-Description of the SubSection
-
 
 \end{document}
 
index 6bbd5bf1214f8b209d9c8b3eefaeb86e84320593..e94eb1f4bb42936339566de6ea676d148ab18c70 100644 (file)
@@ -90,7 +90,7 @@
   plainpages=false,
   pdfpagemode=None}
 
-\hyperbaseurl{http://www.creatis.insa-lyon.fr/creatools/bbtk}
+\hyperbaseurl{http://www.creatis.insa-lyon.fr/creatools/}
 
 \definecolor{myblue}{rgb}{0,0,0.7}
 \definecolor{myred}{rgb}{0.7,0,0}
 \definecolor{mydarkblue}{rgb}{0,0,0.5} 
 
 % ==========================================
-\def\bbtkVersion{@BBTK_VERSION@}
-\def\bbtkVersionDate{@BBTK_VERSION_DATE@}
+\def\UserProyectVersion{@PROJECT_VERSION@}
+\def\UserProyectVersionDate{@PROJECT_VERSION_DATE@}
 \def\todo{\scriptsize\fbox{\bf TODO !!}\normalsize}
 \def\x{\bm{x}}
-\def\BBTK{{\xspace}The {\bf Black Box Toolkit} }
-\def\bbtk{{\xspace}$\texttt{bbtk}$ }
-\def\bbi{{\xspace}$\texttt{bbi}$ }
-\def\bbStudio{{\xspace}$\texttt{bbStudio}$ }
-\def\bbfy{{\xspace}$\texttt{bbfy}$ }
-\def\bbdoc{{\xspace}$\texttt{bbdoc}$ }
-\def\bbCreatePackage{{\xspace}$\texttt{bbCreatePackage}$ }
-\def\bbPackageBrowser{{\xspace}$\texttt{bbPackageBrowser}$ }
-\def\bbCreateBlackBox{{\xspace}$\texttt{bbCreateBlackBox}$ }
-\def\bbs{{\xspace}$\texttt{bbs}$ }
-\def\bbc{{\xspace}$\texttt{bbc}$ }
-\def\bbRegeneratePackageDoc{{\xspace}$\texttt{bbRegeneratePackageDoc}$ }
-\def\bbRegenerateBoxesLists{{\xspace}$\texttt{bbRegenerateBoxesLists}$ }
-\def\bbPlugPackage{{\xspace}$\texttt{bbPlugPackage}$ }
+\def\UserProyect{{\xspace}$\texttt{@PROYECT_NAME@}$ }
 
 \def\bb{{\xspace}$\texttt{bb}$ }
 %\def\bbp{{\xspace}$\texttt{bbp}$\xspace}
 
 \def\xml{{\xspace}$\texttt{xml}$ }
 
-\def\itk{{\xspace}$\texttt{itk}$ }
-\def\vtk{{\xspace}$\texttt{vtk}$ }
-\def\gdcm{{\xspace}$\texttt{gdcm}$ }
-\def\gsmis{{\xspace}$\texttt{gsmis}$ }
-\def\wx{{\xspace}$\texttt{wxWidgets}$ }
 
 \def\lin{{\xspace}\textit{Linux} }
 \def\win{{\xspace}\textit{Windows} }
 
-% the same macros with no space at the end
-
-\def\BBTKns{{\xspace}The {\bf Black Box Toolkit}}
-\def\bbtkns{{\xspace}$\texttt{bbtk}$}
-\def\bbins{{\xspace}$\texttt{bbi}$}
-\def\bbfyns{{\xspace}$\texttt{bbfy}$}
-\def\bbdocns{{\xspace}$\texttt{bbdoc}$}
-\def\bbStudions{{\xspace}$\texttt{bbStudio}$}
-\def\bbCreatePackagens{{\xspace}$\texttt{bbCreatePackage}$}
-\def\bbPackageBrowserns{{\xspace}$\texttt{bbPackageBrowser}$}
-\def\bbCreateBlackBoxns{{\xspace}$\texttt{bbCreateBlackBox}$}
-\def\bbsns{{\xspace}$\texttt{bbs}$}
-\def\bbns{{\xspace}$\texttt{bb}$}
-\def\bbcns{{\xspace}$\texttt{bbc}$}
-%\def\bbp{{\xspace}$\texttt{bbp}$\xspace}
-\def\bbRegeneratePackageDocns{{\xspace}$\texttt{bbRegeneratePackageDoc}$}
-\def\bbRegenerateBoxesListsns{{\xspace}$\texttt{bbRegenerateBoxesLists}$}
-\def\bbPlugPackagens{{\xspace}$\texttt{bbPlugPackage}$}
-
-
-\def\cmakens{{\xspace}$\texttt{cmake}$}
-
-\def\Cns{{\xspace}$\texttt{C}$}
-\def\CPPns{{\xspace}$\texttt{C++}$}
-
-\def\xmlns{{\xspace}$\texttt{xml}$}
-
-\def\itkns{{\xspace}$\texttt{itk}$}
-\def\vtkns{{\xspace}$\texttt{vtk}$}
-\def\gdcmns{{\xspace}$\texttt{gdcm}$}
-\def\gsmisns{{\xspace}$\texttt{gsmis}$}
-\def\wxns{{\xspace}$\texttt{wxWidgets}$}
-
-\def\linns{{\xspace}\textit{Linux}}
-\def\winns{{\xspace}\textit{Windows}}
-
 
-\def\bbtkGuide [#1]{
+\def\UserDocumentGuide [#1]{
 \begin{center}
-{\Large \BBTK}
+{\Large \UserProyect}
 \vspace{1cm}
 
 {\Huge #1}
 \vspace{1cm}
 
-\bbtk version \bbtkVersion \hspace{2mm}(\bbtkVersionDate)
+\UserProyect version \UserProyectVersion \hspace{2mm}(\UserProyectVersionDate)
 \vspace{0.5cm}
 
 Generated on : \today 
 \vspace{0.5cm}
 
-Eduardo D\'avila, Laurent Guigues, Jean-Pierre Roux
+Eduardo D\'avila, Jean-Pierre Roux, Juan Carlos Prieto
 \vspace{0.3cm}
 
 CREATIS-LRMN, Centre de Recherche en Imagerie M\'edicale \\ 
 CNRS UMR 5220, INSERM U620, INSA Lyon, Universit\'e Claude-Bernard Lyon 1
 
-http://www.creatis.insa-lyon.fr/creatools/bbtk 
 \end{center}
 \tableofcontents
 \listoftables
@@ -202,7 +147,7 @@ http://www.creatis.insa-lyon.fr/creatools/bbtk
 
 % ==========================================
 %%% mode: latex
-%%% TeX-master: "bbtkUsersGuide"
+%%% TeX-master: "UserProyectUsersGuide"
 %%% End: 
 
 \newcounter{Ctrfile}
index 0fe9af09a82073019eb80abfc901931f3ec25d55..54410f796c429681bd5546e21d8a7b6c2bc8ce53 100644 (file)
@@ -1,27 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>Help Contents - bbtk @BBTK_VERSION@ </title>
+  <title>Help Contents - User Proyect @BBTK_VERSION@ </title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <H1>Help Contents</H1>
 
-<a href="bbdoc/index-category.html#demo" target="information">Demos</a><br>
-<a href="bbdoc/index-category.html#example" target="information">Examples</a>
-
-<H2>Guides</H2>
-
-<a href="bbtkUsersGuide/bbtkUsersGuide.html" target="information">User's Guide</a><br>
-<a href="bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.html" target="information">Package Developer's Guide</a><br>
-<a href="doxygen/bbtk/main.html" target="information">bbtk library doxygen doc</a><br>
-
-<H2>Boxes</H2>
-
-<a target="information" href="bbdoc/index-alpha.html">Alphabetical list</a><br>
-<a target="information" href="bbdoc/index-package.html">List by package</a><br>
-<a target="information" href="bbdoc/index-category.html">List by category</a><br>
-<a target="information" href="bbdoc/index-adaptors.html">List of adaptors</a><br>
+<a href="http://www.creatis.insa-lyon.fr/software/public/creatools/bbtk/v0_9_2/doc/" target="information">BBTK Doc</a><br>
 
 </body>
 </html> 
index f8b5a7dba16fa135da8b795d60235f16076a00ef..d1c4acd4b509aa04c05daf3f86d06b5653ac1def 100644 (file)
@@ -9,6 +9,6 @@
 </head>
 
 <body>
-<p><a href="bbtkWebSite/menu.html">Redirection</a></p>
+<p><a href="template_WebSite/menu.html">Redirection</a></p>
 </body>
 </html>
index 942d01882a0fad967c3858702bc623eb89c6fe0b..09ed25dcc9bb084b00ec2cc40fe8fc03101ff308 100644 (file)
@@ -11,62 +11,15 @@ FOREACH(page ${HTML_PAGES})
   GET_FILENAME_COMPONENT(filename "${page}" NAME)
   CONFIGURE_FILE(
     ${page}
-    ${BBTK_DOC_BUILD_PATH}/template_WebSite/${filename}
+    ${${PROJECT_NAME}_DOC_BUILD_PATH}/template_WebSite/${filename}
     @ONLY
     )
   # Install
   INSTALL(
-    FILES ${BBTK_DOC_BUILD_PATH}/template_WebSite/${filename}
-    DESTINATION ${BBTK_DOC_INSTALL_PATH}/template_WebSite
+    FILES ${${PROJECT_NAME}_DOC_BUILD_PATH}/template_WebSite/${filename}
+    DESTINATION ${${PROJECT_NAME}_DOC_INSTALL_PATH}/template_WebSite
     )
 ENDFOREACH(page)
 
-
-#===================================================================
-# Regenerate package doc / boxes lists
-# Must be made manually as:
-# 1) Is useless for installers (it is to be run after install)
-# 2) Can be done manually for a build tree (e.g. in bbStudio)
-IF(FALSE)
-
-SET(INDEX_OUTPUT index-alpha.html)
-
-IF (WIN32)
-  
-  SET(USE_DOT TRUE)
-  MAKE_DLL_PATH()
-
-   ADD_CUSTOM_COMMAND(
-     OUTPUT ${INDEX_OUTPUT}
-         COMMAND 
-     set Path=${DLL_PATH} && cd ${BBTK_BIN_PATH} && bbRegeneratePackageDoc -a -q &&  bbRegenerateBoxesLists -q
-
-    DEPENDS ${BBTK_PACKAGES_DEPS}
-          )
-
-ELSE (WIN32)
-  
-  #     MESSAGE(STATUS "PACKAGE_DEPS=${BBTK_PACKAGES_DEPS}")
-  
-  SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-  #   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
-  
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${INDEX_OUTPUT}
-    COMMAND 
-    
-    cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ./bbRegeneratePackageDoc -a -q &&  ./bbRegenerateBoxesLists -q
-    
-    DEPENDS ${BBTK_PACKAGES_DEPS} bbRegeneratePackageDoc bbRegenerateBoxesLists
-    )
-  
-ENDIF (WIN32)
-
-ADD_CUSTOM_TARGET(
-  bbdoc ALL
-  DEPENDS ${INDEX_OUTPUT}
-  )
-          
-ENDIF(FALSE)
           
 MESSAGE(STATUS "=======================================")
index 9b5f41ba9f262298616e1628edb489c89ffeec9f..483722c0d5701a4a2d105616072371a9f2f5a0c8 100644 (file)
@@ -3,11 +3,10 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>BBTK @BBTK_VERSION@ Install</title>
+  <title>User Project Documentation</title>
 </head>
 <body>
-<div style="text-align: center;"><big>BBTK @BBTK_VERSION@
-(@BBTK_VERSION_DATE@) build instructions</big><br>
+<div style="text-align: center;"><big> build instructions</big><br>
 <div style="text-align: left;">
 <ol id="mozToc">
 <!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6-->
index cc2028ebfad9d7f58d3fc656ea3d7bdbc2e75324..2d6181eba6590f99b567b2d2bf00642d6d5f43ba 100644 (file)
@@ -1,42 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>USER DOCUMENTATION</title>
-  <meta http-equiv="Content-Type"
content="text/html; charset=iso-8859-1">
+  <meta content="text/html; charset=ISO-8859-1"
+ http-equiv="content-type">
 <title>Home</title>
 </head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);">
-<small> <font size="3"><small>
-<a target="information" href="home.html">Home</a><br>
-<a href="./install.html" target="information">Build instructions</a></small></font></small><br>
-<hr style="width: 100%; height: 2px;">Guides and documentation
+<body>
+<div style="text-align: center;">
+<big><span style="font-weight: bold;">
+User Project documentation<br>
+</big></span><br>
+
+<div style="text-align: left;">Follow <a
+ href="./install.html" target="information">this link</a> User Install Instructions<br>
+<br>
+Read the <a href="../UserDocumentation/UserDocumentation.html" target="information">users' guide</a> To find out more about this application.<br>
 <br>
-<small> <font size="3"><small><a
- href="../bbtkUsersGuide/bbtkUsersGuide.html" target="information">User's
-Guide</a> (<font size="2"><small><small><a
- href="../bbtkUsersGuide/bbtkUsersGuide.pdf" target="information">pdf</a></small></small></font>)
-</small></font></small><br>
-<small><font size="3"><small> <a
- href="http://www.creatis.insa-lyon.fr/creatools/documentation"
- target="information">Package Developer's Guide</a> 
-</small></font></small><br>
+Or read read the pdf file with the documentation <a
+ href="../UserDocumentation/UserDocumentation.pdf" target="information"> (pdf) </a> <br>
+<br>
+The futures developers in this project might be also interested in the <a
+ href="../doxygen/index.html" target="information">doxygen documentation</a> of the
+source code of bbtk library.<br>
 
-<ul>
-</ul>
-<hr style="width: 100%; height: 2px;">Boxes<big><br>
-</big><font size="2">
-<small><big><a target="information" href="../bbdoc/index-alpha.html">Alphabetical
-list</a><br>
-<a target="information" href="../bbdoc/index-package.html">List by
-package</a><br>
-<a target="information" href="../bbdoc/index-category.html">List by
-category</a><br>
-<a target="information" href="../bbdoc/index-adaptors.html">List of
-adaptors</a></big>
 <br>
-</small></font>
-<hr style="width: 100%; height: 2px;">
-<blockquote><big> </big></blockquote>
-&nbsp;
+<br>
+</div>
 </body>
 </html>
index c36352ff5cb4dfa76156e0d639ccd2c85023defe..9c0bba882c3e8bd2c2f6ea83c53565d6e449865e 100755 (executable)
@@ -15,21 +15,27 @@ set OUTPUT=%1
 set PROJECT=%2
 
 
-rem echo output =  %OUTPUT%
+echo output =  %OUTPUT%
 rem echo bin    =  %BINPATH%
 rem echo input  =  %INPUT%
-rem echo project=  %PROJECT%
+echo project=  %PROJECT%
 
 IF EXIST %OUTPUT%\%PROJECT% GOTO ERROR02
 
 echo "** Creating new project '%PROJECT%' in folder '%OUTPUT%'"
 
 mkdir %OUTPUT%\%PROJECT%
+
+echo %INPUT% %OUTPUT%\%PROJECT%
+
 xcopy %INPUT% %OUTPUT%\%PROJECT% /S
-"%BINPATH%\creaSed" %OUTPUT%\%PROJECT%\CMakeLists.txt.in  PROJECT_NAME "%PROJECT%" > %OUTPUT%\%PROJECT%\CMakeLists.txt
-del "%OUTPUT%\%PROJECT%\CMakeLists.txt.in" 
 
-echo "Done !" 
+echo %ERRORLEVEL%
+
+rem %BINPATH%\creaSed "\"%OUTPUT%\\%PROJECT%\CMakeLists.txt.in"\"" "PROJECT_NAME" "%PROJECT%" > %OUTPUT%\%PROJECT%\CMakeLists.txt
+rem del "%OUTPUT%\%PROJECT%\CMakeLists.txt.in" 
+
+echo "Done!!!!!!" 
 echo "Edit the file '%OUTPUT%\%PROJECT%\CMakeLists.txt' to customize your project"
 
 
index 0c13a27f0605f3433a376fc03b928b8ba08a2d2c..695b00d5fd45d9686065fa56b2d08d67a65f14c4 100644 (file)
@@ -30,13 +30,20 @@ bool myApp::OnInit( )
    
 #if(_WIN32)
    std::string command("creaNewProject.bat ");
+    std::string command1("creaSed.exe ");
+       std::string command2("del ");
 #else
    std::string command("creaNewProject.sh ");
 #endif
-   command += crea::wx2std(dir) + " " + crea::wx2std(name);
+   command += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\"";
+   command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "PROJECT_NAME " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\"";
+   command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
 
    if ( ! system ( command.c_str() ) )
      {
+                
+                system ( command1.c_str() );
+                system ( command2.c_str() );
        wxMessageBox(_T("Done !"),_T("creaNewProject"),
                    wxOK | wxICON_INFORMATION);
      }
index 288c10d9ce356d4e868df1a6cb6e369f4b202f2b..96ad6b8bfd1cca6f89b38dcf05a150a0ab022f4f 100644 (file)
@@ -24,10 +24,13 @@ void replace(std::string& str,
 //==========================================================================
 int main(int argc, char **argv)
 {
-  
+         
   if (argc!=4) 
     {
-      std::cerr << "usage : "<< argv[0] <<" fileIn  \"FindString\" \"ReplaceString\"" << std::endl;
+               for(int i = 1; i < argc; i++){
+                       std::cerr << "||||      "<<argv[i]<<std::endl;
+               }
+      std::cerr << "usage : "<< argv[0] <<" -fileIn  \"-FindString\" \"-ReplaceString\"" << std::endl;
       return 1;
     }
 
index 21947e3d683e4a7b32f5543fd61a74168374fb69..a2ce726a031fa5929e1fe5ae074305ececd5d413 100644 (file)
@@ -23,6 +23,7 @@ IF(USE_QT4)
   IF(NOT QT_FOUND)     
   
        INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseQt.cmake)
+       #FIND_PACKAGE(Qt4 REQUIRED)     
        
     IF(QT_FOUND)
       MESSAGE ( STATUS "=======================================")
@@ -248,7 +249,8 @@ ENDIF(USE_LATEX)
 #-----------------------------------------------------------------------------
 IF(USE_TTH) 
   IF (NOT TTH_EXECUTABLE)
-    FIND_FILE( TTH_EXECUTABLE NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux $ENV{CREATIS}/tth/) 
+    FIND_FILE( TTH_EXECUTABLE NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux $ENV{TTH}) 
+
     IF (NOT TTH_EXECUTABLE)
       MESSAGE(FATAL_ERROR "TTH not found (LATEX_tth_CONVERTER). Required to build the HTML documentation from tex source")
     ELSE (NOT  TTH_EXECUTABLE)
diff --git a/cmake/CREAMacro_FindAndUseQt.cmake b/cmake/CREAMacro_FindAndUseQt.cmake
new file mode 100644 (file)
index 0000000..0459f33
--- /dev/null
@@ -0,0 +1,576 @@
+
+IF(WIN32)
+       STRING(REGEX REPLACE "\\\\" "/" QT_DIR "$ENV{QTDIR}")
+       SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
+       SET(QT_INCLUDE_DIR "${QT_DIR}/include")
+       SET(QT_QT_INCLUDE_DIR "${QT_INCLUDE_DIR}/Qt")
+       SET(QT_QT3SUPPORT_INCLUDE_DIR "${QT_INCLUDE_DIR}/Qt3Support")
+       SET(QT_QTASSISTANT_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtAssistant")
+       SET(QT_QTCORE_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtCore")
+       SET(QT_QTDESIGNER_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtDesigner")
+       SET(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtDesigner")
+       SET(QT_QTDBUS_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtDBus")
+       SET(QT_QTGUI_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtGui")
+       SET(QT_QTMOTIF_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtMotif")
+       SET(QT_QTNETWORK_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtNetwork")
+       SET(QT_QTNSPLUGIN_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtNsPlugin")
+       SET(QT_QTOPENGL_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtOpenGL")
+       SET(QT_QTSQL_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtSql")
+       SET(QT_QTXML_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtXml")
+       SET(QT_QTSCRIPT_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtScript")
+       SET(QT_QTASSISTANTCLIENT_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtAssistant")
+       SET(QT_QTWEBKIT_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtHelp")
+       SET(QT_QTHELP_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtWebKit")
+       SET(QT_QTXMLPATTERNS_INCLUDE_DIR "${QT_INCLUDE_DIR}/QtXmlPatterns")
+       SET(QT_PHONON_INCLUDE_DIR "${QT_INCLUDE_DIR}/phonon")           
+       SET(QT_FOUND "YES" )
+       SET(QT_DEFINITIONS -DQT_DLL)
+       #            True if QtCore was found.
+       SET(QT_QTCORE_FOUND "YES" )
+       #  QT_QTGUI_FOUND           True if QtGui was found.
+       SET(QT_QTGUI_FOUND "YES" )
+       #  QT_QT3SUPPORT_FOUND      True if Qt3Support was found.
+       SET(QT_QT3SUPPORT_FOUND "YES" )
+       #  QT_QTASSISTANT_FOUND     True if QtAssistant was found.
+       SET(QT_QTASSISTANT_FOUND "YES" )
+       #  QT_QTDBUS_FOUND          True if QtDBus was found.
+       SET(QT_QTDBUS_FOUND "YES" )
+       #  QT_QTDESIGNER_FOUND      True if QtDesigner was found.
+       SET(QT_QTDESIGNER_FOUND "YES" )
+       #  QT_QTDESIGNERCOMPONENTS  True if QtDesignerComponents was found.
+       SET(QT_QTDESIGNERCOMPONENTS "YES" )
+       #  QT_QTMOTIF_FOUND         True if QtMotif was found.
+       SET(QT_QTMOTIF_FOUND "YES" )
+       #  QT_QTNETWORK_FOUND       True if QtNetwork was found.
+       SET(QT_QTNETWORK_FOUND "YES" )
+       #  QT_QTNSPLUGIN_FOUND      True if QtNsPlugin was found.
+       SET(QT_QTNSPLUGIN_FOUND "YES" )
+       #  QT_QTOPENGL_FOUND        True if QtOpenGL was found.
+       SET(QT_QTOPENGL_FOUND "YES" )
+       #  QT_QTSQL_FOUND           True if QtSql was found.
+       SET(QT_QTSQL_FOUND "YES" )
+       #  QT_QTXML_FOUND           True if QtXml was found.
+       SET(QT_QTXML_FOUND "YES" )
+       #  QT_QTSVG_FOUND           True if QtSvg was found.
+       SET(QT_QTSVG_FOUND "YES" )
+       #  QT_QTSCRIPT_FOUND        True if QtScript was found.
+       SET(QT_QTSCRIPT_FOUND "YES" )
+       #  QT_QTTEST_FOUND          True if QtTest was found.
+       SET(QT_QTTEST_FOUND "YES" )
+       #  QT_QTUITOOLS_FOUND       True if QtUiTools was found.
+       SET(QT_QTUITOOLS_FOUND "YES" )
+       #  QT_QTASSISTANTCLIENT_FOUND  True if QtAssistantClient was found.
+       SET(QT_QTASSISTANTCLIENT_FOUND "YES" )
+       #  QT_QTHELP_FOUND          True if QtHelp was found.
+       SET(QT_QTHELP_FOUND "YES" )
+       #  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
+       SET(QT_QTWEBKIT_FOUND "YES" )
+       #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
+       SET(QT_QTXMLPATTERNS_FOUND "YES" )
+       #  QT_PHONON_FOUND          True if phonon was found.
+       SET(QT_PHONON_FOUND "YES" )
+
+       SET(QT_MKSPECS_DIR "${QT_DIR}/mkspecs") 
+       SET(QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )      
+       SET(QT_LIBRARY_DIR "${QT_DIR}/lib")                     
+       
+       SET(QT_MOC_EXECUTABLE "${QT_DIR}/bin/moc.exe")
+       SET(QT_WRAP_CPP "YES")
+       SET(QT_UIC_EXECUTABLE "${QT_DIR}/bin/uic.exe")
+       SET(QT_WRAP_UI "YES")
+       
+       #SET(QT_UIC3_EXECUTABLE "${QT_DIR}/bin/uic3.exe")
+       #SET(QT_RCC_EXECUTABLE "${QT_DIR}/bin/rcc.exe")
+       #SET(QT_LUPDATE_EXECUTABLE "${QT_DIR}/bin/lupdate.exe")
+       #SET(QT_LRELEASE_EXECUTABLE "${QT_DIR}/bin/lrelease.exe")
+       
+       #SET(QT_DBUSCPP2XML_EXECUTABLE "${QT_DIR}/bin/moc.exe")
+       #SET(QT_DBUSXML2CPP_EXECUTABLE "${QT_DIR}/bin/moc.exe")
+       
+       
+       SET(QT_FOUND "YES" )
+               
+       MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
+               SET(${_qt4_files})
+               SET(${_qt4_options})
+               SET(_QT4_DOING_OPTIONS FALSE)
+               FOREACH(_currentArg ${ARGN})
+                 IF ("${_currentArg}" STREQUAL "OPTIONS")
+                       SET(_QT4_DOING_OPTIONS TRUE)
+                 ELSE ("${_currentArg}" STREQUAL "OPTIONS")
+                       IF(_QT4_DOING_OPTIONS) 
+                         LIST(APPEND ${_qt4_options} "${_currentArg}")
+                       ELSE(_QT4_DOING_OPTIONS)
+                         LIST(APPEND ${_qt4_files} "${_currentArg}")
+                       ENDIF(_QT4_DOING_OPTIONS)
+                 ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
+               ENDFOREACH(_currentArg) 
+  ENDMACRO (QT4_EXTRACT_OPTIONS)
+  
+  # macro used to create the names of output files preserving relative dirs
+  MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
+    STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
+    STRING(LENGTH ${infile} _infileLength)
+    SET(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
+    IF(_infileLength GREATER _binlength)
+      STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
+    ENDIF(_infileLength GREATER _binlength)
+    IF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
+      FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
+    ELSE(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
+      FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
+    ENDIF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
+    SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
+    STRING(REPLACE ".." "__" _outfile ${_outfile})
+    GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
+    GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)
+    FILE(MAKE_DIRECTORY ${outpath})
+    SET(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
+  ENDMACRO (QT4_MAKE_OUTPUT_FILE )
+
+  MACRO (QT4_GET_MOC_FLAGS _moc_flags)
+     SET(${_moc_flags})
+     GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
+
+     FOREACH(_current ${_inc_DIRS})
+        SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
+     ENDFOREACH(_current ${_inc_DIRS})
+     
+     GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
+     FOREACH(_current ${_defines})
+        SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
+     ENDFOREACH(_current ${_defines})
+
+     IF(Q_WS_WIN)
+       SET(${_moc_flags} ${${_moc_flags}} -DWIN32)
+     ENDIF(Q_WS_WIN)
+
+  ENDMACRO(QT4_GET_MOC_FLAGS)
+
+  # helper macro to set up a moc rule
+  MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
+    # For Windows, create a parameters file to work around command line length limit
+    IF (WIN32)
+      # Pass the parameters in a file.  Set the working directory to
+      # be that containing the parameters file and reference it by
+      # just the file name.  This is necessary because the moc tool on
+      # MinGW builds does not seem to handle spaces in the path to the
+      # file given with the @ syntax.
+      GET_FILENAME_COMPONENT(_moc_outfile_name "${outfile}" NAME)
+      GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
+      IF(_moc_outfile_dir)
+        SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
+      ENDIF(_moc_outfile_dir)
+      SET (_moc_parameters_file ${outfile}_parameters)
+      SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
+      FILE (REMOVE ${_moc_parameters_file})
+      FOREACH(arg ${_moc_parameters})
+        FILE (APPEND ${_moc_parameters_file} "${arg}\n")
+      ENDFOREACH(arg)
+      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+                         COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
+                         DEPENDS ${infile}
+                         ${_moc_working_dir}
+                         VERBATIM)
+    ELSE (WIN32)     
+      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+                         COMMAND ${QT_MOC_EXECUTABLE}
+                         ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
+                         DEPENDS ${infile})     
+    ENDIF (WIN32)
+  ENDMACRO (QT4_CREATE_MOC_COMMAND)
+
+  
+  MACRO (QT4_GENERATE_MOC infile outfile )
+     QT4_GET_MOC_FLAGS(moc_flags)
+     GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
+     QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
+     SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
+  ENDMACRO (QT4_GENERATE_MOC)
+
+
+  # QT4_WRAP_CPP(outfiles inputfile ... )
+
+  MACRO (QT4_WRAP_CPP outfiles )
+    # get include dirs
+    QT4_GET_MOC_FLAGS(moc_flags)
+    QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
+
+    FOREACH (it ${moc_files})
+      GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
+      QT4_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
+      QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
+      SET(${outfiles} ${${outfiles}} ${outfile})
+    ENDFOREACH(it)
+
+  ENDMACRO (QT4_WRAP_CPP)
+
+
+  # QT4_WRAP_UI(outfiles inputfile ... )
+
+  MACRO (QT4_WRAP_UI outfiles )
+    QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+
+    FOREACH (it ${ui_files})
+      GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+        COMMAND ${QT_UIC_EXECUTABLE}
+        ARGS ${ui_options} -o ${outfile} ${infile}
+        MAIN_DEPENDENCY ${infile})
+      SET(${outfiles} ${${outfiles}} ${outfile})
+    ENDFOREACH (it)
+
+  ENDMACRO (QT4_WRAP_UI)
+
+
+  # QT4_ADD_RESOURCES(outfiles inputfile ... )
+
+  MACRO (QT4_ADD_RESOURCES outfiles )
+    QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+
+    FOREACH (it ${rcc_files})
+      GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
+      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+      GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
+      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
+      #  parse file for dependencies 
+      #  all files are absolute paths or relative to the location of the qrc file
+      FILE(READ "${infile}" _RC_FILE_CONTENTS)
+      STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+      SET(_RC_DEPENDS)
+      FOREACH(_RC_FILE ${_RC_FILES})
+        STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+        STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
+        IF(NOT _ABS_PATH_INDICATOR)
+          SET(_RC_FILE "${rc_path}/${_RC_FILE}")
+        ENDIF(NOT _ABS_PATH_INDICATOR)
+        SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
+      ENDFOREACH(_RC_FILE)
+      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+        COMMAND ${QT_RCC_EXECUTABLE}
+        ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
+        MAIN_DEPENDENCY ${infile}
+        DEPENDS ${_RC_DEPENDS})
+      SET(${outfiles} ${${outfiles}} ${outfile})
+    ENDFOREACH (it)
+
+  ENDMACRO (QT4_ADD_RESOURCES)
+
+  MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
+    GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
+    SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+    SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+    SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+  
+    ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+        COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -p ${_basename} ${_infile}
+        DEPENDS ${_infile})
+  
+    SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+    
+    QT4_GENERATE_MOC(${_header} ${_moc})
+  
+    SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
+    MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+  
+  ENDMACRO(QT4_ADD_DBUS_INTERFACE)
+  
+  
+  MACRO(QT4_ADD_DBUS_INTERFACES _sources)
+     FOREACH (_current_FILE ${ARGN})
+        GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE)
+        # get the part before the ".xml" suffix
+        STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE})
+        STRING(TOLOWER ${_basename} _basename)
+        QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
+     ENDFOREACH (_current_FILE)
+  ENDMACRO(QT4_ADD_DBUS_INTERFACES)
+  
+  
+  MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
+    SET(_customName "${ARGV1}")
+    GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
+    GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
+    
+    IF (_customName)
+      SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
+    ELSE (_customName)
+      SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
+    ENDIF (_customName)
+  
+    ADD_CUSTOM_COMMAND(OUTPUT ${_target}
+        COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_in_file} > ${_target}
+        DEPENDS ${_in_file}
+    )
+  ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
+  
+  
+  MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename )
+    GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
+    
+    SET(_optionalBasename "${ARGV4}")
+    IF (_optionalBasename)
+       SET(_basename ${_optionalBasename} )
+    ELSE (_optionalBasename)
+       STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile})
+       STRING(TOLOWER ${_basename} _basename)
+    ENDIF (_optionalBasename)
+
+    SET(_optionalClassName "${ARGV5}")
+    SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+    SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+    SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+
+    IF(_optionalClassName)
+       ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+          COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
+          DEPENDS ${_infile}
+        )
+    ELSE(_optionalClassName)
+       ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+          COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
+          DEPENDS ${_infile}
+        )
+    ENDIF(_optionalClassName)
+
+    QT4_GENERATE_MOC(${_header} ${_moc})
+    SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+    MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+
+    SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
+  ENDMACRO(QT4_ADD_DBUS_ADAPTOR)
+
+   MACRO(QT4_AUTOMOC)
+      QT4_GET_MOC_FLAGS(_moc_INCS)
+
+      SET(_matching_FILES )
+      FOREACH (_current_FILE ${ARGN})
+
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
+         # This is required to make uic work correctly:
+         # we need to add generated .cpp files to the sources (to compile them),
+         # but we cannot let automoc handle them, as the .cpp files don't exist yet when
+         # cmake is run for the very first time on them -> however the .cpp files might
+         # exist at a later run. at that time we need to skip them, so that we don't add two
+         # different rules for the same moc file
+         GET_SOURCE_FILE_PROPERTY(_skip ${_abs_FILE} SKIP_AUTOMOC)
+
+         IF ( NOT _skip AND EXISTS ${_abs_FILE} )
+
+            FILE(READ ${_abs_FILE} _contents)
+
+            GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
+
+            STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}")
+            IF(_match)
+               FOREACH (_current_MOC_INC ${_match})
+                  STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+                  GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
+                  SET(_header ${_abs_PATH}/${_basename}.h)
+                  SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+                  QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
+                  MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+               ENDFOREACH (_current_MOC_INC)
+            ENDIF(_match)
+         ENDIF ( NOT _skip AND EXISTS ${_abs_FILE} )
+      ENDFOREACH (_current_FILE)
+   ENDMACRO(QT4_AUTOMOC)
+
+   MACRO(QT4_CREATE_TRANSLATION _qm_files)
+      QT4_EXTRACT_OPTIONS(_lupdate_files _lupdate_options ${ARGN})
+      MESSAGE("lupdate_files ${_lupdate_files}")
+      MESSAGE("lupdate_options ${_lupdate_options}")
+      SET(_my_sources)
+      SET(_my_tsfiles)
+      FOREACH (_file ${_lupdate_files})
+         GET_FILENAME_COMPONENT(_ext ${_file} EXT)
+         GET_FILENAME_COMPONENT(_abs_FILE ${_file} ABSOLUTE)
+         IF(_ext MATCHES "ts")
+           LIST(APPEND _my_tsfiles ${_abs_FILE})
+         ELSE(_ext MATCHES "ts")
+           LIST(APPEND _my_sources ${_abs_FILE})
+         ENDIF(_ext MATCHES "ts")
+      ENDFOREACH(_file)
+      FOREACH(_ts_file ${_my_tsfiles})
+        ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
+           COMMAND ${QT_LUPDATE_EXECUTABLE}
+           ARGS ${_lupdate_options} ${_my_sources} -ts ${_ts_file}
+           DEPENDS ${_my_sources})
+      ENDFOREACH(_ts_file)
+      QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})
+   ENDMACRO(QT4_CREATE_TRANSLATION)
+
+   MACRO(QT4_ADD_TRANSLATION _qm_files)
+      FOREACH (_current_FILE ${ARGN})
+         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+         GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
+         SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
+
+         ADD_CUSTOM_COMMAND(OUTPUT ${qm}
+            COMMAND ${QT_LRELEASE_EXECUTABLE}
+            ARGS ${_abs_FILE} -qm ${qm}
+            DEPENDS ${_abs_FILE}
+         )
+         SET(${_qm_files} ${${_qm_files}} ${qm})
+      ENDFOREACH (_current_FILE)
+   ENDMACRO(QT4_ADD_TRANSLATION)
+   
+   
+   # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore."  as part of the filename
+  FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+  FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore_debug QtCored QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QT3SUPPORT_LIBRARY
+  FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_RELEASE NAMES Qt3Support Qt3Support4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_DEBUG   NAMES Qt3Support_debug Qt3Supportd Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTGUI_LIBRARY
+  FIND_LIBRARY(QT_QTGUI_LIBRARY_RELEASE NAMES QtGui QtGui4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTGUI_LIBRARY_DEBUG   NAMES QtGui_debug QtGuid QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTMOTIF_LIBRARY
+  IF(Q_WS_X11)
+    FIND_LIBRARY(QT_QTMOTIF_LIBRARY_RELEASE NAMES QtMotif PATHS ${QT_LIBRARY_DIR}       NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTMOTIF_LIBRARY_DEBUG   NAMES QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  ENDIF(Q_WS_X11)
+
+  # Set QT_QTNETWORK_LIBRARY
+  FIND_LIBRARY(QT_QTNETWORK_LIBRARY_RELEASE NAMES QtNetwork QtNetwork4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTNETWORK_LIBRARY_DEBUG   NAMES QtNetwork_debug QtNetworkd QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTNSPLUGIN_LIBRARY
+  FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY_RELEASE NAMES QtNsPlugin PATHS ${QT_LIBRARY_DIR}       NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY_DEBUG   NAMES QtNsPlugin_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTOPENGL_LIBRARY
+  FIND_LIBRARY(QT_QTOPENGL_LIBRARY_RELEASE NAMES QtOpenGL QtOpenGL4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTOPENGL_LIBRARY_DEBUG   NAMES QtOpenGL_debug QtOpenGLd QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTSQL_LIBRARY
+  FIND_LIBRARY(QT_QTSQL_LIBRARY_RELEASE NAMES QtSql QtSql4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTSQL_LIBRARY_DEBUG   NAMES QtSql_debug QtSqld QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTXML_LIBRARY
+  FIND_LIBRARY(QT_QTXML_LIBRARY_RELEASE NAMES QtXml QtXml4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTXML_LIBRARY_DEBUG   NAMES QtXml_debug QtXmld QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTSVG_LIBRARY
+  FIND_LIBRARY(QT_QTSVG_LIBRARY_RELEASE NAMES QtSvg QtSvg4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTSVG_LIBRARY_DEBUG   NAMES QtSvg_debug QtSvgd QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTUITOOLS_LIBRARY
+  FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_DEBUG   NAMES QtUiTools_debug QtUiToolsd QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTTEST_LIBRARY
+  FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR}                      NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG   NAMES QtTest_debug QtTestd QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTDBUS_LIBRARY
+  # This was introduced with Qt 4.2, where also the naming scheme for debug libs was changed
+  # So does any of the debug lib names listed here actually exist ?
+  FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR}                       NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG   NAMES QtDBus_debug QtDBusd QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTSCRIPT_LIBRARY
+  FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG   NAMES QtScript_debug QtScriptd QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+   
+  # Set QT_QTASSISTANTCLIENT_LIBRARY
+  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTHELP_LIBRARY
+  FIND_LIBRARY(QT_QTHELP_LIBRARY_RELEASE NAMES QtHelp QtHelp4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTHELP_LIBRARY_DEBUG   NAMES QtHelp_debug QtHelpd QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene QtCLucene4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG   NAMES QtCLucene_debug QtCLucened QtCLucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+   
+   # Set QT_QTWEBKIT_LIBRARY
+  FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_RELEASE NAMES QtWebKit QtWebKit4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_DEBUG   NAMES QtWebKit_debug QtWebKitd QtWebKitd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+  # Set QT_QTXMLPATTERNS_LIBRARY
+  FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY_RELEASE NAMES QtXmlPatterns QtXmlPatterns4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY_DEBUG   NAMES QtXmlPatterns_debug QtXmlPatternsd QtXmlPatternsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  
+  # Set QT_PHONON_LIBRARY
+  FIND_LIBRARY(QT_PHONON_LIBRARY_RELEASE NAMES phonon phonon4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_PHONON_LIBRARY_DEBUG   NAMES phonon_debug phonond phonond4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  
+   MACRO (_QT4_ADJUST_LIB_VARS basename)
+    IF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
+
+      # if only the release version was found, set the debug variable also to the release version
+      IF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
+        SET(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY_RELEASE})
+        SET(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE})
+        SET(QT_${basename}_LIBRARIES     ${QT_${basename}_LIBRARY_RELEASE})
+      ENDIF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
+
+      # if only the debug version was found, set the release variable also to the debug version
+      IF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
+        SET(QT_${basename}_LIBRARY_RELEASE ${QT_${basename}_LIBRARY_DEBUG})
+        SET(QT_${basename}_LIBRARY         ${QT_${basename}_LIBRARY_DEBUG})
+        SET(QT_${basename}_LIBRARIES       ${QT_${basename}_LIBRARY_DEBUG})
+      ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
+
+      IF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
+        # if the generator supports configuration types then set
+        # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+        IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+          SET(QT_${basename}_LIBRARY       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
+        ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+          # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+          # then just use the release libraries
+          SET(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE} )
+        ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        SET(QT_${basename}_LIBRARIES       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
+      ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
+
+      SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
+
+      IF (QT_${basename}_LIBRARY)
+        SET(QT_${basename}_FOUND 1)
+      ENDIF (QT_${basename}_LIBRARY)
+
+    ENDIF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
+
+    IF (QT_${basename}_INCLUDE_DIR)
+      #add the include directory to QT_INCLUDES
+      SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
+    ENDIF (QT_${basename}_INCLUDE_DIR)
+
+    # Make variables changeble to the advanced user
+    MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_RELEASE QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR)
+  ENDMACRO (_QT4_ADJUST_LIB_VARS)
+  # Set QT_xyz_LIBRARY variable and add 
+  # library include path to QT_INCLUDES
+  _QT4_ADJUST_LIB_VARS(QTCORE)
+  _QT4_ADJUST_LIB_VARS(QTGUI)
+  _QT4_ADJUST_LIB_VARS(QT3SUPPORT)
+  _QT4_ADJUST_LIB_VARS(QTASSISTANT)
+  _QT4_ADJUST_LIB_VARS(QTDESIGNER)
+  _QT4_ADJUST_LIB_VARS(QTDESIGNERCOMPONENTS)
+  _QT4_ADJUST_LIB_VARS(QTNETWORK)
+  _QT4_ADJUST_LIB_VARS(QTNSPLUGIN)
+  _QT4_ADJUST_LIB_VARS(QTOPENGL)
+  _QT4_ADJUST_LIB_VARS(QTSQL)
+  _QT4_ADJUST_LIB_VARS(QTXML)
+  _QT4_ADJUST_LIB_VARS(QTSVG)
+  _QT4_ADJUST_LIB_VARS(QTSCRIPT)
+  _QT4_ADJUST_LIB_VARS(QTUITOOLS)
+  _QT4_ADJUST_LIB_VARS(QTTEST)
+  _QT4_ADJUST_LIB_VARS(QTDBUS)
+  _QT4_ADJUST_LIB_VARS(QTASSISTANTCLIENT)
+  _QT4_ADJUST_LIB_VARS(QTHELP)
+  _QT4_ADJUST_LIB_VARS(QTWEBKIT)
+  _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
+  _QT4_ADJUST_LIB_VARS(PHONON)
+  _QT4_ADJUST_LIB_VARS(QTCLUCENE)
+ELSEIF(WIN32)
+       FIND_PACKAGE(Qt4 REQUIRED)              
+ENDIF(WIN32)
\ No newline at end of file
index 997050f7d3f6e8c678505815b4a2ea9515cfd79c..56e62a480a966cbebf71d8bdb5bdbb2c0aff479d 100644 (file)
@@ -3,8 +3,8 @@
   Program:   crea
   Module:    $RCSfile: creaSystem.h,v $
   Language:  C++
-  Date:      $Date: 2009/09/17 11:47:46 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/09/30 15:53:19 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -94,7 +94,6 @@
 //#define TEST toto
 
 
-
 #if defined(_WIN32) && defined(CREA_BUILD_SHARED)
 //#include "WWW.h"
   #ifdef CREA_EXPORT_SYMBOLS
index 5cc68e32dae62fcc434b8d26141084bbc10e4f1a..ce64d91a8f806b91df0b1417af2d9640a9313bce 100644 (file)
@@ -19,7 +19,7 @@ namespace crea
 {
   
   template <class T>
-  CREA_EXPORT vtkImageData* NewVtkImageDataFromRaw( T* data, 
+  vtkImageData* NewVtkImageDataFromRaw( T* data, 
                                                    int nx, 
                                                    int ny,
                                                    int nz,