From a37d18909c36e1bcd3427106fa70b91dd5b6c108 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Mon, 21 Nov 2011 12:34:14 +0000 Subject: [PATCH] DFCH: Update creaThirdParty installers (Possible bug solved) --- .../crea_ThirdParty_Libraries/CMakeLists.txt | 66 +++ .../crea_ThirdParty_Libraries/LICENSE.txt | 514 ++++++++++++++++++ .../crea_ThirdParty_Libraries/README.txt | 39 ++ .../appli/CMakeLists.txt | 3 + .../appli/template_appli/CMakeLists.txt | 38 ++ .../install/CMakeLists.txt | 160 ++++++ .../lib/CMakeLists.txt | 2 + .../lib/template_lib/CMakeLists.txt | 59 ++ .../cmake/crea_ThirdParty_dlls/CMakeLists.txt | 11 + .../cmake/crea_ThirdParty_dlls/LICENSE.txt | 1 + .../cmake/crea_ThirdParty_dlls/README.txt | 19 + .../install/CMakeLists.txt | 136 +++++ ...install_thirdparty_dlls_cmake.bat_TEMPLATE | 5 +- ...ll_thirdparty_libraries_cmake.bat_TEMPLATE | 4 +- .../move_thirdparty_dlls.bat_TEMPLATE | 5 +- .../move_thirdparty_libraries.bat_TEMPLATE | 5 +- .../scripts/install_thirdparty_dlls_cmake.bat | 11 +- .../install_thirdparty_libraries_cmake.bat | 11 +- .../scripts/move_thirdparty_dlls.bat | 2 +- .../scripts/move_thirdparty_libraries.bat | 2 +- 20 files changed, 1068 insertions(+), 25 deletions(-) create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/LICENSE.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt create mode 100644 Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt new file mode 100644 index 0000000..86d6121 --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt @@ -0,0 +1,66 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +################################### +PROJECT(crea_ThirdParty_Libraries) +################################### + +#================================== +# The project version +SET(PROJECT_MAJOR_VERSION 3) +SET(PROJECT_MINOR_VERSION 0) +SET(PROJECT_BUILD_VERSION 1) +#================================== + +#================================== +# Find crea +SET(CREA_VERBOSE_CMAKE TRUE) +#FIND_PACKAGE(crea REQUIRED) +#IF (crea_FOUND) +# INCLUDE(${crea_USE_FILE}) +#ENDIF(crea_FOUND) +#================================== + +#================================== +# Do not allow to build inside the source tree +#CREA_PREVENT_IN_SOURCE_BUILD() +#================================== + +#================================== +# Libraries/tools used +# Note : Set USE_CREA to ON +# if you need to LINK against crea +# (and not only use its macros) +#SET(USE_CREA OFF) +#SET(USE_GDCM OFF) +#SET(USE_GDCM_VTK OFF) +#SET(USE_GDCM2 OFF) +#SET(USE_WXWIDGETS OFF) +#SET(USE_KWWIDGETS OFF) +#SET(USE_VTK OFF) +#SET(USE_ITK OFF) +#SET(USE_BOOST OFF) +#SET(USE_DOXYGEN OFF) +#SET(USE_LATEX OFF) +#SET(USE_TTH OFF) +#CREA_FIND_AND_USE_LIBRARIES() +#================================== + +#================================== +# Where to put executables and libs +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) +SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}) +MARK_AS_ADVANCED( + CMAKE_BACKWARDS_COMPATIBILITY + EXECUTABLE_OUTPUT_PATH + LIBRARY_OUTPUT_PATH + ) +#================================== + + +#================================== +# Subdirs +#SUBDIRS(appli) +#SUBDIRS(lib) +SUBDIRS(install) +#================================== +#================================== diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/LICENSE.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/LICENSE.txt new file mode 100644 index 0000000..fe87c25 --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/LICENSE.txt @@ -0,0 +1,514 @@ +CeCILL-B FREE SOFTWARE LICENSE AGREEMENT + + + Notice + +This Agreement is a Free Software license agreement that is the result +of discussions between its authors in order to ensure compliance with +the two main principles guiding its drafting: + + * firstly, compliance with the principles governing the distribution + of Free Software: access to source code, broad rights granted to + users, + * secondly, the election of a governing law, French law, with which + it is conformant, both as regards the law of torts and + intellectual property law, and the protection that it offers to + both authors and holders of the economic rights over software. + +The authors of the CeCILL-B (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) +license are: + +Commissariat à l'Energie Atomique - CEA, a public scientific, technical +and industrial research establishment, having its principal place of +business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. + +Centre National de la Recherche Scientifique - CNRS, a public scientific +and technological establishment, having its principal place of business +at 3 rue Michel-Ange, 75794 Paris cedex 16, France. + +Institut National de Recherche en Informatique et en Automatique - +INRIA, a public scientific and technological establishment, having its +principal place of business at Domaine de Voluceau, Rocquencourt, BP +105, 78153 Le Chesnay cedex, France. + + + Preamble + +This Agreement is an open source software license intended to give users +significant freedom to modify and redistribute the software licensed +hereunder. + +The exercising of this freedom is conditional upon a strong obligation +of giving credits for everybody that distributes a software +incorporating a software ruled by the current license so as all +contributions to be properly identified and acknowledged. + +In consideration of access to the source code and the rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors only have limited liability. + +In this respect, the risks associated with loading, using, modifying +and/or developing or reproducing the software by the user are brought to +the user's attention, given its Free Software status, which may make it +complicated to use, with the result that its use is reserved for +developers and experienced professionals having in-depth computer +knowledge. Users are therefore encouraged to load and test the +suitability of the software as regards their requirements in conditions +enabling the security of their systems and/or data to be ensured and, +more generally, to use and operate it in the same conditions of +security. This Agreement may be freely reproduced and published, +provided it is not altered, and that no provisions are either added or +removed herefrom. + +This Agreement may apply to any or all software for which the holder of +the economic rights decides to submit the use thereof to its provisions. + + + Article 1 - DEFINITIONS + +For the purpose of this Agreement, when the following expressions +commence with a capital letter, they shall have the following meaning: + +Agreement: means this license agreement, and its possible subsequent +versions and annexes. + +Software: means the software in its Object Code and/or Source Code form +and, where applicable, its documentation, "as is" when the Licensee +accepts the Agreement. + +Initial Software: means the Software in its Source Code and possibly its +Object Code form and, where applicable, its documentation, "as is" when +it is first distributed under the terms and conditions of the Agreement. + +Modified Software: means the Software modified by at least one +Contribution. + +Source Code: means all the Software's instructions and program lines to +which access is required so as to modify the Software. + +Object Code: means the binary files originating from the compilation of +the Source Code. + +Holder: means the holder(s) of the economic rights over the Initial +Software. + +Licensee: means the Software user(s) having accepted the Agreement. + +Contributor: means a Licensee having made at least one Contribution. + +Licensor: means the Holder, or any other individual or legal entity, who +distributes the Software under the Agreement. + +Contribution: means any or all modifications, corrections, translations, +adaptations and/or new functions integrated into the Software by any or +all Contributors, as well as any or all Internal Modules. + +Module: means a set of sources files including their documentation that +enables supplementary functions or services in addition to those offered +by the Software. + +External Module: means any or all Modules, not derived from the +Software, so that this Module and the Software run in separate address +spaces, with one calling the other when they are run. + +Internal Module: means any or all Module, connected to the Software so +that they both execute in the same address space. + +Parties: mean both the Licensee and the Licensor. + +These expressions may be used both in singular and plural form. + + + Article 2 - PURPOSE + +The purpose of the Agreement is the grant by the Licensor to the +Licensee of a non-exclusive, transferable and worldwide license for the +Software as set forth in Article 5 hereinafter for the whole term of the +protection granted by the rights over said Software. + + + Article 3 - ACCEPTANCE + +3.1 The Licensee shall be deemed as having accepted the terms and +conditions of this Agreement upon the occurrence of the first of the +following events: + + * (i) loading the Software by any or all means, notably, by + downloading from a remote server, or by loading from a physical + medium; + * (ii) the first time the Licensee exercises any of the rights + granted hereunder. + +3.2 One copy of the Agreement, containing a notice relating to the +characteristics of the Software, to the limited warranty, and to the +fact that its use is restricted to experienced users has been provided +to the Licensee prior to its acceptance as set forth in Article 3.1 +hereinabove, and the Licensee hereby acknowledges that it has read and +understood it. + + + Article 4 - EFFECTIVE DATE AND TERM + + + 4.1 EFFECTIVE DATE + +The Agreement shall become effective on the date when it is accepted by +the Licensee as set forth in Article 3.1. + + + 4.2 TERM + +The Agreement shall remain in force for the entire legal term of +protection of the economic rights over the Software. + + + Article 5 - SCOPE OF RIGHTS GRANTED + +The Licensor hereby grants to the Licensee, who accepts, the following +rights over the Software for any or all use, and for the term of the +Agreement, on the basis of the terms and conditions set forth hereinafter. + +Besides, if the Licensor owns or comes to own one or more patents +protecting all or part of the functions of the Software or of its +components, the Licensor undertakes not to enforce the rights granted by +these patents against successive Licensees using, exploiting or +modifying the Software. If these patents are transferred, the Licensor +undertakes to have the transferees subscribe to the obligations set +forth in this paragraph. + + + 5.1 RIGHT OF USE + +The Licensee is authorized to use the Software, without any limitation +as to its fields of application, with it being hereinafter specified +that this comprises: + + 1. permanent or temporary reproduction of all or part of the Software + by any or all means and in any or all form. + + 2. loading, displaying, running, or storing the Software on any or + all medium. + + 3. entitlement to observe, study or test its operation so as to + determine the ideas and principles behind any or all constituent + elements of said Software. This shall apply when the Licensee + carries out any or all loading, displaying, running, transmission + or storage operation as regards the Software, that it is entitled + to carry out hereunder. + + + 5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS + +The right to make Contributions includes the right to translate, adapt, +arrange, or make any or all modifications to the Software, and the right +to reproduce the resulting software. + +The Licensee is authorized to make any or all Contributions to the +Software provided that it includes an explicit notice that it is the +author of said Contribution and indicates the date of the creation thereof. + + + 5.3 RIGHT OF DISTRIBUTION + +In particular, the right of distribution includes the right to publish, +transmit and communicate the Software to the general public on any or +all medium, and by any or all means, and the right to market, either in +consideration of a fee, or free of charge, one or more copies of the +Software by any means. + +The Licensee is further authorized to distribute copies of the modified +or unmodified Software to third parties according to the terms and +conditions set forth hereinafter. + + + 5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION + +The Licensee is authorized to distribute true copies of the Software in +Source Code or Object Code form, provided that said distribution +complies with all the provisions of the Agreement and is accompanied by: + + 1. a copy of the Agreement, + + 2. a notice relating to the limitation of both the Licensor's + warranty and liability as set forth in Articles 8 and 9, + +and that, in the event that only the Object Code of the Software is +redistributed, the Licensee allows effective access to the full Source +Code of the Software at a minimum during the entire period of its +distribution of the Software, it being understood that the additional +cost of acquiring the Source Code shall not exceed the cost of +transferring the data. + + + 5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE + +If the Licensee makes any Contribution to the Software, the resulting +Modified Software may be distributed under a license agreement other +than this Agreement subject to compliance with the provisions of Article +5.3.4. + + + 5.3.3 DISTRIBUTION OF EXTERNAL MODULES + +When the Licensee has developed an External Module, the terms and +conditions of this Agreement do not apply to said External Module, that +may be distributed under a separate license agreement. + + + 5.3.4 CREDITS + +Any Licensee who may distribute a Modified Software hereby expressly +agrees to: + + 1. indicate in the related documentation that it is based on the + Software licensed hereunder, and reproduce the intellectual + property notice for the Software, + + 2. ensure that written indications of the Software intended use, + intellectual property notice and license hereunder are included in + easily accessible format from the Modified Software interface, + + 3. mention, on a freely accessible website describing the Modified + Software, at least throughout the distribution term thereof, that + it is based on the Software licensed hereunder, and reproduce the + Software intellectual property notice, + + 4. where it is distributed to a third party that may distribute a + Modified Software without having to make its source code + available, make its best efforts to ensure that said third party + agrees to comply with the obligations set forth in this Article . + +If the Software, whether or not modified, is distributed with an +External Module designed for use in connection with the Software, the +Licensee shall submit said External Module to the foregoing obligations. + + + 5.3.5 COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES + +Where a Modified Software contains a Contribution subject to the CeCILL +license, the provisions set forth in Article 5.3.4 shall be optional. + +A Modified Software may be distributed under the CeCILL-C license. In +such a case the provisions set forth in Article 5.3.4 shall be optional. + + + Article 6 - INTELLECTUAL PROPERTY + + + 6.1 OVER THE INITIAL SOFTWARE + +The Holder owns the economic rights over the Initial Software. Any or +all use of the Initial Software is subject to compliance with the terms +and conditions under which the Holder has elected to distribute its work +and no one shall be entitled to modify the terms and conditions for the +distribution of said Initial Software. + +The Holder undertakes that the Initial Software will remain ruled at +least by this Agreement, for the duration set forth in Article 4.2. + + + 6.2 OVER THE CONTRIBUTIONS + +The Licensee who develops a Contribution is the owner of the +intellectual property rights over this Contribution as defined by +applicable law. + + + 6.3 OVER THE EXTERNAL MODULES + +The Licensee who develops an External Module is the owner of the +intellectual property rights over this External Module as defined by +applicable law and is free to choose the type of agreement that shall +govern its distribution. + + + 6.4 JOINT PROVISIONS + +The Licensee expressly undertakes: + + 1. not to remove, or modify, in any manner, the intellectual property + notices attached to the Software; + + 2. to reproduce said notices, in an identical manner, in the copies + of the Software modified or not. + +The Licensee undertakes not to directly or indirectly infringe the +intellectual property rights of the Holder and/or Contributors on the +Software and to take, where applicable, vis-à-vis its staff, any and all +measures required to ensure respect of said intellectual property rights +of the Holder and/or Contributors. + + + Article 7 - RELATED SERVICES + +7.1 Under no circumstances shall the Agreement oblige the Licensor to +provide technical assistance or maintenance services for the Software. + +However, the Licensor is entitled to offer this type of services. The +terms and conditions of such technical assistance, and/or such +maintenance, shall be set forth in a separate instrument. Only the +Licensor offering said maintenance and/or technical assistance services +shall incur liability therefor. + +7.2 Similarly, any Licensor is entitled to offer to its licensees, under +its sole responsibility, a warranty, that shall only be binding upon +itself, for the redistribution of the Software and/or the Modified +Software, under terms and conditions that it is free to decide. Said +warranty, and the financial terms and conditions of its application, +shall be subject of a separate instrument executed between the Licensor +and the Licensee. + + + Article 8 - LIABILITY + +8.1 Subject to the provisions of Article 8.2, the Licensee shall be +entitled to claim compensation for any direct loss it may have suffered +from the Software as a result of a fault on the part of the relevant +Licensor, subject to providing evidence thereof. + +8.2 The Licensor's liability is limited to the commitments made under +this Agreement and shall not be incurred as a result of in particular: +(i) loss due the Licensee's total or partial failure to fulfill its +obligations, (ii) direct or consequential loss that is suffered by the +Licensee due to the use or performance of the Software, and (iii) more +generally, any consequential loss. In particular the Parties expressly +agree that any or all pecuniary or business loss (i.e. loss of data, +loss of profits, operating loss, loss of customers or orders, +opportunity cost, any disturbance to business activities) or any or all +legal proceedings instituted against the Licensee by a third party, +shall constitute consequential loss and shall not provide entitlement to +any or all compensation from the Licensor. + + + Article 9 - WARRANTY + +9.1 The Licensee acknowledges that the scientific and technical +state-of-the-art when the Software was distributed did not enable all +possible uses to be tested and verified, nor for the presence of +possible defects to be detected. In this respect, the Licensee's +attention has been drawn to the risks associated with loading, using, +modifying and/or developing and reproducing the Software which are +reserved for experienced users. + +The Licensee shall be responsible for verifying, by any or all means, +the suitability of the product for its requirements, its good working +order, and for ensuring that it shall not cause damage to either persons +or properties. + +9.2 The Licensor hereby represents, in good faith, that it is entitled +to grant all the rights over the Software (including in particular the +rights set forth in Article 5). + +9.3 The Licensee acknowledges that the Software is supplied "as is" by +the Licensor without any other express or tacit warranty, other than +that provided for in Article 9.2 and, in particular, without any warranty +as to its commercial value, its secured, safe, innovative or relevant +nature. + +Specifically, the Licensor does not warrant that the Software is free +from any error, that it will operate without interruption, that it will +be compatible with the Licensee's own equipment and software +configuration, nor that it will meet the Licensee's requirements. + +9.4 The Licensor does not either expressly or tacitly warrant that the +Software does not infringe any third party intellectual property right +relating to a patent, software or any other property right. Therefore, +the Licensor disclaims any and all liability towards the Licensee +arising out of any or all proceedings for infringement that may be +instituted in respect of the use, modification and redistribution of the +Software. Nevertheless, should such proceedings be instituted against +the Licensee, the Licensor shall provide it with technical and legal +assistance for its defense. Such technical and legal assistance shall be +decided on a case-by-case basis between the relevant Licensor and the +Licensee pursuant to a memorandum of understanding. The Licensor +disclaims any and all liability as regards the Licensee's use of the +name of the Software. No warranty is given as regards the existence of +prior rights over the name of the Software or as regards the existence +of a trademark. + + + Article 10 - TERMINATION + +10.1 In the event of a breach by the Licensee of its obligations +hereunder, the Licensor may automatically terminate this Agreement +thirty (30) days after notice has been sent to the Licensee and has +remained ineffective. + +10.2 A Licensee whose Agreement is terminated shall no longer be +authorized to use, modify or distribute the Software. However, any +licenses that it may have granted prior to termination of the Agreement +shall remain valid subject to their having been granted in compliance +with the terms and conditions hereof. + + + Article 11 - MISCELLANEOUS + + + 11.1 EXCUSABLE EVENTS + +Neither Party shall be liable for any or all delay, or failure to +perform the Agreement, that may be attributable to an event of force +majeure, an act of God or an outside cause, such as defective +functioning or interruptions of the electricity or telecommunications +networks, network paralysis following a virus attack, intervention by +government authorities, natural disasters, water damage, earthquakes, +fire, explosions, strikes and labor unrest, war, etc. + +11.2 Any failure by either Party, on one or more occasions, to invoke +one or more of the provisions hereof, shall under no circumstances be +interpreted as being a waiver by the interested Party of its right to +invoke said provision(s) subsequently. + +11.3 The Agreement cancels and replaces any or all previous agreements, +whether written or oral, between the Parties and having the same +purpose, and constitutes the entirety of the agreement between said +Parties concerning said purpose. No supplement or modification to the +terms and conditions hereof shall be effective as between the Parties +unless it is made in writing and signed by their duly authorized +representatives. + +11.4 In the event that one or more of the provisions hereof were to +conflict with a current or future applicable act or legislative text, +said act or legislative text shall prevail, and the Parties shall make +the necessary amendments so as to comply with said act or legislative +text. All other provisions shall remain effective. Similarly, invalidity +of a provision of the Agreement, for any reason whatsoever, shall not +cause the Agreement as a whole to be invalid. + + + 11.5 LANGUAGE + +The Agreement is drafted in both French and English and both versions +are deemed authentic. + + + Article 12 - NEW VERSIONS OF THE AGREEMENT + +12.1 Any person is authorized to duplicate and distribute copies of this +Agreement. + +12.2 So as to ensure coherence, the wording of this Agreement is +protected and may only be modified by the authors of the License, who +reserve the right to periodically publish updates or new versions of the +Agreement, each with a separate number. These subsequent versions may +address new issues encountered by Free Software. + +12.3 Any Software distributed under a given version of the Agreement may +only be subsequently distributed under the same version of the Agreement +or a subsequent version. + + + Article 13 - GOVERNING LAW AND JURISDICTION + +13.1 The Agreement is governed by French law. The Parties agree to +endeavor to seek an amicable solution to any disagreements or disputes +that may arise during the performance of the Agreement. + +13.2 Failing an amicable solution within two (2) months as from their +occurrence, and unless emergency proceedings are necessary, the +disagreements or disputes shall be referred to the Paris Courts having +jurisdiction, by the more diligent Party. + + +Version 1.0 dated 2006-09-05. diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt new file mode 100644 index 0000000..97ebe45 --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt @@ -0,0 +1,39 @@ +creaThirdPartyLibraries + +To use this project you must compile each of the following libraries, if possible compile them in release and debug mode + +wxWidgets + http://www.wxwidgets.org/downloads/ +VTK + http://www.vtk.org/get-software.php +ITK + http://www.itk.org/HTML/Download.htm +GDCM + checkout from cvs +QT + http://www.qtsoftware.com/downloads +Boost + http://www.boost.org/users/download/ + + +when you finish compiling this libraries choose a common install directory and use the install mechanism for each library +for the libraries that do not have a install mechanism, copy the headers directory and the directory where the *.lib and *.dll +were created. + +After doing this you must have in the choosen directory all of the libraries. +Run a search process in the directory for all dlls (*.dll), by doing this your result will show all of the dlls from the libraries +cut and paste all of the dlls in a different directoy (this will be useful when generating creaThirdPartyDlls). + +Run the cmake file configuration and give the installation directory to the configuration. + +Run in visual Studio the package configuration + +A installer must be created with all the contents of the installation directory. + + +In case of adding a new library, follow the same process and check the CMakeLists.txt file in the installation directory, +you might need to check the environment variables each library uses so they can be added in the installation process + +End + +(c) CREATIS 2009 \ No newline at end of file diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt new file mode 100644 index 0000000..1f5bdfc --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt @@ -0,0 +1,3 @@ +# Add a SUBDIRS command for each of your applications +# SUBDIRS(MyApp1) +# SUBDIRS(MyApp2) diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt new file mode 100644 index 0000000..abff49e --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt @@ -0,0 +1,38 @@ +#---------------------------------------------------------------------------- +# SET THE NAME OF YOUR EXECUTABLE +SET ( EXE_NAME MyExe ) +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# EXECUTABLE SOURCES (TO BE COMPILED) +# EITHER LIST ALL .cxx, *.cpp, *.cc IN CURRENT DIR USING NEXT LINE: +FILE(GLOB ${EXE_NAME}_SOURCES *.cxx *.cpp *.cc) +# OR MANUALLY LIST YOUR FILES WITH NEXT COMMAND (WITHOUT EXTENSION) +# SET ( ${EXE_NAME}_SOURCES +# +# ) +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# DEPENDENCIES (LIBRARIES TO LINK WITH) +SET ( ${EXE_NAME}_LINK_LIBRARIES + # ${crea_LIBRARIES} + # ${WXWIDGETS_LIBRARIES} + # ${KWWidgets_LIBRARIES} + # ${VTK_LIBRARIES} + # ${ITK_LIBRARIES} + # ${GDCM_LIBRARIES} + # ${BOOST_LIBRARIES} + ) +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# CREATES AND INSTALLS THE EXE +# Set to ON if your appli has a GUI (to build as a Win32 app on windows) +SET(${EXE_NAME}_HAS_GUI OFF) +# Set to ON if your appli has a GUI but you also want a msdos console on windows +SET(${EXE_NAME}_CONSOLE OFF) +CREA_ADD_EXECUTABLE( ${EXE_NAME} ) +#---------------------------------------------------------------------------- + + diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt new file mode 100644 index 0000000..223e25b --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt @@ -0,0 +1,160 @@ + + + + + +#----------------------------------------------------------------------------- +# CPACK+NSIS PACKAGING +#----------------------------------------------------------------------------- + +#---Documentation------------- +#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack +#http://www.cmake.org/Wiki/CMake:CPackConfiguration +#http://www.cmake.org/Wiki/CMake:Install_Commands + + +INCLUDE(InstallRequiredSystemLibraries) + +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS") +SET(CPACK_PACKAGE_VENDOR "CREATIS") +SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt") +SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") +SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) + + + + + + + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + IF(WIN32) + SET(CMAKE_INSTALL_PREFIX C:/CreaTools/${PROJECT_NAME}) + ENDIF(WIN32) + + + + + +IF(WIN32 AND NOT UNIX) + # There is a bug in NSI that does not handle full unix paths properly. Make + # sure there is at least one set of four (4) backlasshes. +#EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp") +# SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe") + SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}") + SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr") + SET(CPACK_NSIS_MODIFY_PATH OFF) + + + set (CREA_BOOST_LYBRARY Boost-1.47.0) + set (CREA_GDCM_LYBRARY gdcm ) + set (CREA_ITK_LYBRARY InsightToolkit-3.20.0 ) + set (CREA_QT_LYBRARY Qt-4.7.3 ) + set (CREA_VTK_LYBRARY VTK ) + set (CREA_WXWIN_LYBRARY wxWidgets-2.9.2) + set (CREA_XERCES_LYBRARY xerces-c-3.1.1) + set (CREA_MIKATEX_LYBRARY MiKTeX-2.9) + + #set (CREA_KWWIDGETS_LYBRARY KWWidgets-090109 ) + + set (MessageLibraryPath "CREA_LIBRARY_DESTINATION_PATH (itk,vtk,gdcm,wx,KWWidgets,tth,MikTex)") + set (CREA_LIBRARY_SOURCE_PATH "" CACHE PATH ${MessageLibraryPath} ) + set (CREA_LIBRARY_DESTINATION_PATH "Library") + set (CREA_BIN_DESTINATION_PATH "bin") + + + IF(NOT CREA_LIBRARY_SOURCE_PATH) + MESSAGE(FATAL_ERROR "${MessageLibraryPath} not found") + ENDIF(NOT CREA_LIBRARY_SOURCE_PATH) + + + +ELSE(WIN32 AND NOT UNIX) +# SET(CPACK_STRIP_FILES "bin/bbi") + SET(CPACK_SOURCE_STRIP_FILES "") +ENDIF(WIN32 AND NOT UNIX) +#SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!") + + + +# Aditional INSTALL for CPACK mecanism. +IF (WIN32) + + # tth + FILE(GLOB LST_FILE_TTH "${CREA_LIBRARY_SOURCE_PATH}/tth/*.*") + FOREACH( iLST ${LST_FILE_TTH} ) + INSTALL( + FILES ${iLST} + DESTINATION bin/tth/ + ) + ENDFOREACH(iLST) + + # MikTex + FILE(GLOB LST_FILE_MIKATEX "${CREA_LIBRARY_SOURCE_PATH}/${CREA_MIKATEX_LYBRARY}/*.*") + FOREACH( iLSTM ${LST_FILE_MIKATEX} ) + INSTALL( + FILES ${iLSTM} + DESTINATION bin/${CREA_MIKATEX_LYBRARY}/ + ) + ENDFOREACH(iLSTM) + + +INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY} DESTINATION ${CREA_BIN_DESTINATION_PATH} ) + + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_BOOST_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_GDCM_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_ITK_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_QT_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_VTK_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_WXWIN_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_XERCES_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) + + + SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin") + SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}") + + SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' + + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATIS_THIRDPARTYLIBRARIES_DIRS' '${CREATIS_THIRDPARTYLIBRARIES_DIRS}' + !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"' + ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH' + Push '$0;' + Push '%CREATIS_THIRDPARTYLIBRARIES_DIRS%' + Call StrStr + Pop $2 + StrCmp $2 '' '' AddToPath_doneEED + StrCpy $0 \\\"$0;%CREATIS_THIRDPARTYLIBRARIES_DIRS%\\\" + WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 + + AddToPath_doneEED: + + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'BOOST_ROOT' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_BOOST_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'GDCM_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_GDCM_LYBRARY}\\\\lib\\\\gdcm' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_ITK_LYBRARY}\\\\lib\\\\InsightToolkit' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'QTDIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_QT_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.8' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_WXWIN_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'XERCES_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_XERCES_LYBRARY}' + #WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'KWWidgets_dir' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_KWWIDGETS_LYBRARY}\\\\lib\\\\KWWidgets' + + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + ") + + + SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + !define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATIS_THIRDPARTYLIBRARIES_DIRS' '' + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + ") + + INCLUDE(CPack) + + +ENDIF (WIN32) + + + diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt new file mode 100644 index 0000000..a9bd25b --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt @@ -0,0 +1,2 @@ +# Add a SUBDIRS command for each of your libraries +# SUBDIRS(MyLib1) diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt new file mode 100644 index 0000000..a41e67d --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt @@ -0,0 +1,59 @@ +#---------------------------------------------------------------------------- +# SET THE NAME OF YOUR LIBRARY +SET ( LIBRARY_NAME MyLib ) +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# CREATES A USER OPTION IN CMAKE +OPTION ( BUILD_${LIBRARY_NAME} "Build ${LIBRARY_NAME} library ?" ON)) +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +IF ( BUILD_${LIBRARY_NAME} ) +#---------------------------------------------------------------------------- + + #---------------------------------------------------------------------------- + # BUILD LIBRARY + #---------------------------------------------------------------------------- + + #---------------------------------------------------------------------------- + # LIBRARY HEADERS (TO BE INSTALLED) + # EITHER LIST ALL .h IN CURRENT DIR USING NEXT LINE: + FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h") + # OR MANUALLY LIST YOUR HEADERS WITH NEXT COMMAND + # SET ( ${LIBRARY_NAME}_HEADERS + # + # ) + #---------------------------------------------------------------------------- + + #---------------------------------------------------------------------------- + # LIBRARY SOURCES (TO BE COMPILED) + # EITHER LIST ALL .cxx, *.cpp, *.cc IN CURRENT DIR USING NEXT LINE: + FILE(GLOB ${LIBRARY_NAME}_SOURCES *.cxx *.cpp *.cc) + # OR MANUALLY LIST YOUR FILES WITH NEXT COMMAND (WITHOUT EXTENSION) + # SET ( ${LIBRARY_NAME}_SOURCES + # + # ) + #---------------------------------------------------------------------------- + + #---------------------------------------------------------------------------- + # LIBRARY DEPENDENCIES (LIBRARIES TO LINK WITH) + SET ( ${LIBRARY_NAME}_LINK_LIBRARIES + ${crea_LIBRARIES} + # ${WXWIDGETS_LIBRARIES} + # ${VTK_LIBRARIES} + # ${ITK_LIBRARIES} + # ${GDCM_LIBRARIES} + # ${BOOST_LIBRARIES} + ) + #---------------------------------------------------------------------------- + + + #---------------------------------------------------------------------------- + # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL + CREA_ADD_LIBRARY( ${LIBRARY_NAME} ) + #---------------------------------------------------------------------------- + + + #--------------------------------------------------------------------------- +ENDIF ( BUILD_${LIBRARY_NAME} ) diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt new file mode 100644 index 0000000..bd7c781 --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt @@ -0,0 +1,11 @@ +PROJECT(crea_ThirdParty_dlls) + +cmake_minimum_required(VERSION 2.6) + +SET(PROJECT_MAJOR_VERSION 3) +SET(PROJECT_MINOR_VERSION 0) +SET(PROJECT_BUILD_VERSION 1) + +SET(CREA_VERBOSE_CMAKE TRUE) + +SUBDIRS(install) diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt new file mode 100644 index 0000000..276a7e7 --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt @@ -0,0 +1 @@ +Please refer to each software license. \ No newline at end of file diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt new file mode 100644 index 0000000..a818d32 --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt @@ -0,0 +1,19 @@ +To build creaThird party dlls 2 mechanisms are proposed + +The first one involves the installation directories where you compiled the libraries +wxWidgets, GDCM, VTK, ITK, boost and QT + +This will recurse into the directories finding the corresponding dlls, and creating the +installer with them. + +The second mechanism will ask for a directory where all the dlls must be placed before hand. +This mechanism will be easier if you have compiled and install each library and you have created +the creaThirdPartyLibraries installer. + +Launch the CMakeLists.txt file and Give the directory where all the dlls are located. +Add the tth directory as this was added in previous releases. + +End + + +(c) CREATIS 2009 \ No newline at end of file diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt new file mode 100644 index 0000000..5dc628d --- /dev/null +++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt @@ -0,0 +1,136 @@ + +#----------------------------------------------------------------------------- +# CPACK+NSIS PACKAGING +#----------------------------------------------------------------------------- + +#---Documentation------------- +#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack +#http://www.cmake.org/Wiki/CMake:CPackConfiguration +#http://www.cmake.org/Wiki/CMake:Install_Commands + + +INCLUDE(InstallRequiredSystemLibraries) + +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS") +SET(CPACK_PACKAGE_VENDOR "CREATIS") +SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt") +SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") +SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) + + + + + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + IF(WIN32) + SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea_dlls_extern) + ENDIF(WIN32) + + + +IF(WIN32 AND NOT UNIX) + # There is a bug in NSI that does not handle full unix paths properly. Make + # sure there is at least one set of four (4) backlasshes. +#EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp") +# SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe") + SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}") + SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr") + SET(CPACK_NSIS_MODIFY_PATH OFF) +ELSE(WIN32 AND NOT UNIX) +# SET(CPACK_STRIP_FILES "bin/bbi") + SET(CPACK_SOURCE_STRIP_FILES "") +ENDIF(WIN32 AND NOT UNIX) +#SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!") + +# Aditional INSTALL for CPACK mecanism. +IF(WIN32) + + set (MessageLibraryPath "CREA_LIBRARY_DLL_PATH (itk,vtk,gdcm,wx,Qt,tth)") + set (CREA_LIBRARY_DLL_PATH "" CACHE PATH ${MessageLibraryPath} ) + + + IF(NOT CREA_LIBRARY_DLL_PATH) + MESSAGE(FATAL_ERROR "${MessageLibraryPath} not found") + ENDIF(NOT CREA_LIBRARY_DLL_PATH) + +## INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) + STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}") + # INSTALL( FILES ${WINDIR}/system32/msvcp71d.dll DESTINATION bin/ ) + # INSTALL( FILES ${WINDIR}/system32/msvcr71d.dll DESTINATION bin/ ) + + + INSTALL(DIRECTORY ${CREA_LIBRARY_DLL_PATH}/ DESTINATION bin/ ) + +#EED 19-11-2009 +# FILE(GLOB LST_FILE_DLL "${CREA_LIBRARY_DLL_PATH}/*.dll") +# FOREACH( iLST ${LST_FILE_DLL} ) +# INSTALL( +# FILES ${iLST} +# DESTINATION bin/ +# ) +# ENDFOREACH(iLST) + +#EED 19-11-2009 +# FILE(GLOB LST_FILE_TTH "${CREA_LIBRARY_DLL_PATH}/tth/*.*") +# FOREACH( iLST ${LST_FILE_TTH} ) +# INSTALL( +# FILES ${iLST} +# DESTINATION bin/tth/ +# ) +# ENDFOREACH(iLST) + +#EED 19-11-2009 +# SET(MIKTEXDIR "${CREA_LIBRARY_DLL_PATH}/MikTex-2.7/") +# INSTALL( +# DIRECTORY ${MIKTEXDIR} +# DESTINATION bin/MikTex-2.7 +# ) + +#EED-08oct2009 STRING(REGEX REPLACE "\\\\" "/" ENVPATH "$ENV{Path}") + +#EED 19-11-2009 +# SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin") + + SET(CREA_DLLS_DIR "$INSTDIR\\\\bin") +#EED 19-11-2009 +# SET(CREATIS_ENVIRONMENT_DIRS ";${CREA_DLLS_DIR};${MIKTEX_INSTALL_DIR}") + SET(CREATIS_THIRDPARTYDLLS_DIRS ";${CREA_DLLS_DIR}") + + + SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + + +#EED 19-11-2009 +# WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' + + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATIS_THIRDPARTYDLLS_DIRS' '${CREATIS_THIRDPARTYDLLS_DIRS}' + + !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"' + ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH' + + Push '$0;' + Push '%CREATIS_THIRDPARTYDLLS_DIRS%' + Call StrStr + Pop $2 + StrCmp $2 '' '' AddToPath_doneEED + StrCpy $0 \\\"$0;%CREATIS_THIRDPARTYDLLS_DIRS%\\\" + WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 + + AddToPath_doneEED: + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + ") + + SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + !define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATIS_THIRDPARTYDLLS_DIRS' '' + + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + + ") + +ENDIF(WIN32) + +INCLUDE(CPack) \ No newline at end of file diff --git a/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE index 39bc1df..8e1525c 100644 --- a/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE +++ b/Install_ThirdParty/install_thirdparty_dlls_cmake.bat_TEMPLATE @@ -1,7 +1,6 @@ -echo set thirdpartydlls_cmake=C:\Creatis\creaToolsTools\Install_ThirdParty\cmake -set thirdpartydlls_folder=C:\Temp\ThirdParty\creaThirdParty_dlls +set thirdpartyGeneration= cd scripts -call install_thirdparty_dlls_cmake.bat %thirdpartydlls_folder% >> install_thirdparty_dlls_cmake.log 2>&1 +call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% >> install_thirdparty_dlls_cmake.log 2>&1 cd .. \ No newline at end of file diff --git a/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE b/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE index a5a19e2..4bf4111 100644 --- a/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE +++ b/Install_ThirdParty/install_thirdparty_libraries_cmake.bat_TEMPLATE @@ -1,6 +1,6 @@ -set thirdpartylib_folder=C:\Temp\ThirdParty\creaThirdParty_libraries +set thirdpartyGeneration= cd scripts -call install_thirdparty_libraries_cmake.bat %thirdpartylib_folder% >> install_thirdparty_libraries_cmake.log 2>&1 +call install_thirdparty_libraries_cmake.bat %thirdpartyGeneration% >> install_thirdparty_libraries_cmake.log 2>&1 cd .. \ No newline at end of file diff --git a/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE b/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE index 2884ef6..3754399 100644 --- a/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE +++ b/Install_ThirdParty/move_thirdparty_dlls.bat_TEMPLATE @@ -1,8 +1,7 @@ -set thirdpartyGeneration= -set thirdpartyInstallPath= +set thirdpartyGeneration= cd scripts -call move_thirdparty_dlls.bat %thirdpartyGeneration% %thirdpartyInstallPath% >> move_thirdparty_dlls.log 2>&1 +call move_thirdparty_dlls.bat %thirdpartyGeneration% >> move_thirdparty_dlls.log 2>&1 cd .. diff --git a/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE b/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE index 3637a4d..b01123f 100644 --- a/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE +++ b/Install_ThirdParty/move_thirdparty_libraries.bat_TEMPLATE @@ -1,7 +1,6 @@ -set thirdpartyGeneration= -set thirdpartyInstallPath= +set thirdpartyGeneration= cd scripts -call move_thirdparty_libraries.bat %thirdpartyGeneration% %thirdpartyInstallPath% >> move_thirdparty_libraries.log 2>&1 +call move_thirdparty_libraries.bat %thirdpartyGeneration% >> move_thirdparty_libraries.log 2>&1 cd .. \ No newline at end of file diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat index 127d443..d0e1f5b 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat @@ -12,17 +12,16 @@ if %PROCESSOR_ARCHITECTURE%==x86 ( echo ----End Asking Architecture-------- - -set thirdpartydllspath=%1 +set thirdpartyGeneration=%1 set thirdparty_cmake=%cd%\..\cmake set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +set thirdpartydllspath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls -set binpath=%thirdparty_cmake%\crea_ThirdParty_dlls_Bin -set installpath="C:\Temp\creatools\crea_ThirdParty_dlls" -echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls" +set binpath=%thirdpartyGeneration%\thirdparty_bin\crea_ThirdParty_dlls_Bin +set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls" if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" if not exist %vcvarsall% ( @@ -40,5 +39,5 @@ cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt cmake CMakeCache.txt FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType% -msbuild /p:Configuration=release INSTALL.vcxproj +msbuild /p:Configuration=release PACKAGE.vcxproj @echo on \ No newline at end of file diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat index 0145678..87ff828 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat @@ -12,17 +12,16 @@ if %PROCESSOR_ARCHITECTURE%==x86 ( echo ----End Asking Architecture-------- - -set thirdpartylibpath=%1 +set thirdpartyGeneration=%1 set thirdparty_cmake=%cd%\..\cmake set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries -set binpath=%thirdparty_cmake%\crea_ThirdParty_Libraries_Bin -set installpath="C:\Temp\creatools\crea_ThirdParty_Libraries" -echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries" +set binpath=%thirdpartyGeneration%\thirdparty_bin\creaTPLBin +set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries" if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" if not exist %vcvarsall% ( @@ -40,5 +39,5 @@ cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt cmake -D CREA_LIBRARY_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt cmake CMakeCache.txt FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType% -msbuild /p:Configuration=release INSTALL.vcxproj +msbuild /p:Configuration=release PACKAGE.vcxproj @echo on \ No newline at end of file diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index c9506a9..36034f7 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -9,7 +9,7 @@ set thirdpartyInstallPath=%2 set installpath=%thirdpartyGeneration%\thirdparty_install set binpath=%thirdpartyGeneration%\thirdparty_bin set sourcepath=%thirdpartyGeneration%\thirdparty_source -set creaThirdPartydlls=%thirdpartyInstallPath%\creaThirdParty_dlls +set creaThirdPartydlls=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls set qt=Qt-4.7.3 set wxWidgets=wxWidgets-2.9.2 diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index 70a4142..487a278 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -21,7 +21,7 @@ set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe" set installpath=%thirdpartyGeneration%\thirdparty_install set binpath=%thirdpartyGeneration%\thirdparty_bin set sourcepath=%thirdpartyGeneration%\thirdparty_source -set creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries +set creaThirdPartyLibraries=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries set qt=Qt-4.7.3 set wxWidgets=wxWidgets-2.9.2 -- 2.47.0