From 51bbabbabfb78c5d732cb71bcd09826381980a68 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Mon, 21 Nov 2011 23:49:22 +0000 Subject: [PATCH] DFCH: Stable Version of creaThirdPartyLibraries --- .../install/CMakeLists.txt | 15 ++---------- .../scripts/install_thirdparty_all.bat | 24 +++++-------------- .../scripts/move_thirdparty_libraries.bat | 14 +++++++++-- 3 files changed, 20 insertions(+), 33 deletions(-) diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt index 223e25b..e80eaf4 100644 --- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt @@ -92,22 +92,11 @@ IF (WIN32) ) 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_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_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} ) diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index bd8a5ee..ff08b83 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -38,11 +38,15 @@ if not exist %vcvarsall% ( echo ERROR!!! Visual Studio has not been found in the system exit ) -if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe" + if not exist %miktex% ( + set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe" + if not exist %miktex% ( echo ERROR!!! MiKTex has not been found in the system exit + ) ) + if not exist %wgetPath% ( echo ERROR!!! wget has not been found in the system exit @@ -151,12 +155,7 @@ echo ----------Installing--------------- cd %QTDIR% - -if %PROCESSOR_ARCHITECTURE%==x86 ( echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp -) else ( -echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp -) nmake cd C:\ @@ -199,18 +198,7 @@ echo ----------Installing--------------- cd %sourcepath%\%boost% call bootstrap.bat - -if %PROCESSOR_ARCHITECTURE%==x86 ( - - b2.exe --toolset=msvc-10.0 --build-type=complete stage - -) else ( - -cd stage - b2.exe --toolset=msvc-10.0 --build-type=complete architecture=x86 address-model=64 stage - -) - +b2.exe --toolset=msvc-10.0 --build-type=complete stage cd C:\ echo -----End Boost Installation-------- diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index 487a278..14344bb 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -45,10 +45,18 @@ set VTKINSTALLDIR=%installpath%\%vtk% set GDCMINSTALLDIR=%installpath%\%gdcm% set TTHDIR=%sourcepath%\%tth% -if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe" if not exist %miktex% ( + set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe" + if not exist %miktex% ( echo ERROR!!! MiKTex has not been found in the system exit + ) + else ( + set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9" + ) +) +else ( +set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9" ) echo ----------------------------------- @@ -56,6 +64,7 @@ echo Environment variables Configuration echo ----------------------------------- echo ThirdpartyGeneration=%thirdpartyGeneration% echo MikTex=%miktex% +echo miktexAux=%miktexAux% echo InstallPath=%installpath% echo BinPath=%binpath% echo SourcePath=%sourcepath% @@ -336,9 +345,10 @@ echo -------------TTH------------------- echo ----------------------------------- mkdir %creaThirdPartyLibraries%\tth XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i + echo ----------------------------------- echo -------------MiKText--------------- echo ----------------------------------- mkdir %creaThirdPartyLibraries%\%miktexAux% -XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i +XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i \ No newline at end of file -- 2.45.0