From: Juan Prieto Date: Wed, 30 Sep 2009 15:53:08 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~1 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1105ecb7bc1fab95fd553ab104275df6506fea22;p=crea.git *** empty log message *** --- diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt index 892756f..3f138d5 100644 --- a/appli/creaNewProject/CMakeLists.txt +++ b/appli/creaNewProject/CMakeLists.txt @@ -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 diff --git a/appli/creaNewProject/NewProject/CMakeLists.txt.in b/appli/creaNewProject/NewProject/CMakeLists.txt.in index c31d327..5a90c41 100644 --- a/appli/creaNewProject/NewProject/CMakeLists.txt.in +++ b/appli/creaNewProject/NewProject/CMakeLists.txt.in @@ -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() #================================== diff --git a/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake b/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake index 38f4733..2446671 100644 --- a/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake +++ b/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake @@ -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) diff --git a/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake b/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake index 5e79304..1cba436 100644 --- a/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake +++ b/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake @@ -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} ) #------------------------------------------------------------------------- diff --git a/appli/creaNewProject/NewProject/cmake/UserBuildLatexDoc.cmake b/appli/creaNewProject/NewProject/cmake/UserBuildLatexDoc.cmake index b70ac84..1f5ad69 100644 --- a/appli/creaNewProject/NewProject/cmake/UserBuildLatexDoc.cmake +++ b/appli/creaNewProject/NewProject/cmake/UserBuildLatexDoc.cmake @@ -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) diff --git a/appli/creaNewProject/NewProject/cmake/UserConfig.cmake b/appli/creaNewProject/NewProject/cmake/UserConfig.cmake index 4245d10..58dfc68 100644 --- a/appli/creaNewProject/NewProject/cmake/UserConfig.cmake +++ b/appli/creaNewProject/NewProject/cmake/UserConfig.cmake @@ -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}") diff --git a/appli/creaNewProject/NewProject/doc/UserDocumentation/UserDocumentation.tex b/appli/creaNewProject/NewProject/doc/UserDocumentation/UserDocumentation.tex index 9510553..f49e631 100644 --- a/appli/creaNewProject/NewProject/doc/UserDocumentation/UserDocumentation.tex +++ b/appli/creaNewProject/NewProject/doc/UserDocumentation/UserDocumentation.tex @@ -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} diff --git a/appli/creaNewProject/NewProject/doc/config.tex b/appli/creaNewProject/NewProject/doc/config.tex index 6bbd5bf..e94eb1f 100644 --- a/appli/creaNewProject/NewProject/doc/config.tex +++ b/appli/creaNewProject/NewProject/doc/config.tex @@ -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} @@ -98,24 +98,11 @@ \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} @@ -127,73 +114,31 @@ \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} diff --git a/appli/creaNewProject/NewProject/doc/help_contents.html.in b/appli/creaNewProject/NewProject/doc/help_contents.html.in index 0fe9af0..54410f7 100644 --- a/appli/creaNewProject/NewProject/doc/help_contents.html.in +++ b/appli/creaNewProject/NewProject/doc/help_contents.html.in @@ -1,27 +1,13 @@ - Help Contents - bbtk @BBTK_VERSION@ + Help Contents - User Proyect @BBTK_VERSION@

Help Contents

-Demos
-Examples - -

Guides

- -User's Guide
-Package Developer's Guide
-bbtk library doxygen doc
- -

Boxes

- -Alphabetical list
-List by package
-List by category
-List of adaptors
+BBTK Doc
diff --git a/appli/creaNewProject/NewProject/doc/index-no-frame.html.in b/appli/creaNewProject/NewProject/doc/index-no-frame.html.in index f8b5a7d..d1c4acd 100644 --- a/appli/creaNewProject/NewProject/doc/index-no-frame.html.in +++ b/appli/creaNewProject/NewProject/doc/index-no-frame.html.in @@ -9,6 +9,6 @@ -

Redirection

+

Redirection

diff --git a/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt b/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt index 942d018..09ed25d 100644 --- a/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt +++ b/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt @@ -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 "=======================================") diff --git a/appli/creaNewProject/NewProject/doc/template_WebSite/install.html b/appli/creaNewProject/NewProject/doc/template_WebSite/install.html index 9b5f41b..483722c 100644 --- a/appli/creaNewProject/NewProject/doc/template_WebSite/install.html +++ b/appli/creaNewProject/NewProject/doc/template_WebSite/install.html @@ -3,11 +3,10 @@ - BBTK @BBTK_VERSION@ Install + User Project Documentation -
BBTK @BBTK_VERSION@ -(@BBTK_VERSION_DATE@) build instructions
+
build instructions
    diff --git a/appli/creaNewProject/NewProject/doc/template_WebSite/menu.html b/appli/creaNewProject/NewProject/doc/template_WebSite/menu.html index cc2028e..2d6181e 100644 --- a/appli/creaNewProject/NewProject/doc/template_WebSite/menu.html +++ b/appli/creaNewProject/NewProject/doc/template_WebSite/menu.html @@ -1,42 +1,30 @@ - + - USER DOCUMENTATION - + + Home - - -Home
    -Build instructions
    -
    Guides and documentation + +
    + +User Project documentation
    +
    + +
    Follow this link User Install Instructions
    +
    +Read the users' guide To find out more about this application.

    - User's -Guide (pdf) -
    - Package Developer's Guide -
    +Or read read the pdf file with the documentation (pdf)
    +
    +The futures developers in this project might be also interested in the doxygen documentation of the +source code of bbtk library.
    -
      -
    -
    Boxes
    -     -Alphabetical -list
    -List by -package
    -List by -category
    -List of -adaptors
    -     -
    -
    -  +
    +
    diff --git a/appli/creaNewProject/creaNewProject.bat.in b/appli/creaNewProject/creaNewProject.bat.in index c36352f..9c0bba8 100755 --- a/appli/creaNewProject/creaNewProject.bat.in +++ b/appli/creaNewProject/creaNewProject.bat.in @@ -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" diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp index 0c13a27..695b00d 100644 --- a/appli/creaNewProject/creaNewProject.cpp +++ b/appli/creaNewProject/creaNewProject.cpp @@ -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); } diff --git a/appli/creaSed/creaSed.cpp b/appli/creaSed/creaSed.cpp index 288c10d..96ad6b8 100644 --- a/appli/creaSed/creaSed.cpp +++ b/appli/creaSed/creaSed.cpp @@ -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 << "|||| "<]*>" "" _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 diff --git a/src/creaSystem.h b/src/creaSystem.h index 997050f..56e62a4 100644 --- a/src/creaSystem.h +++ b/src/creaSystem.h @@ -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 diff --git a/src/creaVtk.txx b/src/creaVtk.txx index 5cc68e3..ce64d91 100644 --- a/src/creaVtk.txx +++ b/src/creaVtk.txx @@ -19,7 +19,7 @@ namespace crea { template - CREA_EXPORT vtkImageData* NewVtkImageDataFromRaw( T* data, + vtkImageData* NewVtkImageDataFromRaw( T* data, int nx, int ny, int nz,