From: jean-pierre roux Date: Fri, 3 Jul 2009 09:16:07 +0000 (+0000) Subject: re-indent X-Git-Tag: EED.02Oct2009~37 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=887231b4fcb3ab4d183936211a764d8a27e07e42;p=creaImageIO.git re-indent --- diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index 8e179f2..7b430a5 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -1,8 +1,4 @@ - - - - #----------------------------------------------------------------------------- # CPACK+NSIS PACKAGING #----------------------------------------------------------------------------- @@ -29,9 +25,6 @@ SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) 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. @@ -59,11 +52,7 @@ ENDIF(BUILD_STANDALONE_INSTALLER) # Aditional INSTALL for CPACK mecanism. IF (WIN32) - INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) - - - ENDIF (WIN32) INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.txt DESTINATION bin/Shared/gimmick ) @@ -71,10 +60,10 @@ ENDIF (WIN32) IF (BUILD_STANDALONE_INSTALLER) IF(WIN32) - INSTALL( FILES ${SYSTEMROOT}/system32/msvcp71d.dll DESTINATION bin/ ) - INSTALL( FILES ${SYSTEMROOT}/system32/msvcr71d.dll DESTINATION bin/ ) - INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//crea.dll DESTINATION bin/ ) - INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//sqlite3.dll DESTINATION bin/ ) + INSTALL( FILES ${SYSTEMROOT}/system32/msvcp71d.dll DESTINATION bin/ ) + INSTALL( FILES ${SYSTEMROOT}/system32/msvcr71d.dll DESTINATION bin/ ) + INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//crea.dll DESTINATION bin/ ) + INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//sqlite3.dll DESTINATION bin/ ) #VTK dlls #GDCM dlls @@ -90,13 +79,12 @@ IF (BUILD_STANDALONE_INSTALLER) ENDIF(USE_VTK) IF(USE_BOOST) - INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_date_time-vc71-mt-1_38.dll DESTINATION bin/ ) - INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_filesystem-vc71-mt-1_38.dll DESTINATION bin/ ) - INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_iostreams-vc71-mt-1_38.dll DESTINATION bin/ ) - INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_signals-vc71-mt-1_38.dll DESTINATION bin/ ) - INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_thread-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_date_time-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_filesystem-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_iostreams-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_signals-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_thread-vc71-mt-1_38.dll DESTINATION bin/ ) ENDIF(USE_BOOST) - ENDIF(WIN32)