← Back to branch summary

~ubuntu-branches/ubuntu/trusty/hugin/trusty-proposed

« back to all changes in this revision

Viewing changes to CMakeModules/win_bundle.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2011-01-06 14:28:24 UTC
  • mfrom: (1.1.9 upstream) (0.1.21 experimental)
  • Revision ID: james.westby@ubuntu.com-20110106142824-zn9lxylg5z44dynn
* Drop Cyril Brulebois from Uploaders. Thank you very much for your work.
* Bump package version. (rc3 was re-released as 2010.4.0).

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeModules/win_bundle.cmake
41
41
  INSTALL(FILES ${PANO13_SRC_DIR}/AUTHORS
42
42
          ${PANO13_SRC_DIR}/gpl.txt
43
43
          ${PANO13_SRC_DIR}/README
44
 
          ${PANO13_SRC_DIR}/TODO
45
44
          ${PANO13_SRC_DIR}/doc/Optimize.txt
46
45
          ${PANO13_SRC_DIR}/doc/PTblender.readme
47
46
          ${PANO13_SRC_DIR}/doc/PTmender.readme
94
93
 
95
94
  # find path to gnu make 
96
95
  FIND_PATH(GNUMake_DIR make.exe
 
96
            ${SOURCE_BASE_DIR}/Make-3.82/Release
97
97
            ${SOURCE_BASE_DIR}/Make-3.81/Release
98
98
            DOC "Location of gnu make"
99
99
            NO_DEFAULT_PATH)
151
151
    FILE(GLOB OPENEXR_DLL ${OPENEXR_BIN_DIR}/*.dll)
152
152
    FILE(GLOB BOOST_THREAD_DLL ${Boost_LIBRARY_DIRS}/boost_thread*.dll)
153
153
    FILE(GLOB BOOST_DATE_TIME_DLL ${Boost_LIBRARY_DIRS}/boost_date_time*.dll)
 
154
    FILE(GLOB BOOST_SYSTEM_DLL ${Boost_LIBRARY_DIRS}/boost_system*.dll)
 
155
    FILE(GLOB BOOST_REGEX_DLL ${Boost_LIBRARY_DIRS}/boost_regex*.dll)
154
156
    FIND_FILE(EXIV2_DLL 
155
157
      NAMES exiv2.dll 
156
158
      PATHS ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
181
183
    FIND_FILE(WXWIDGETS_DLL7 NAMES wxbase28u_xml_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
182
184
 
183
185
    INSTALL(FILES ${TIFF_DLL} ${JPEG_DLL} ${PNG_DLL} ${ZLIB_DLL} ${OPENEXR_DLL} 
184
 
        ${BOOST_THREAD_DLL} ${BOOST_DATE_TIME_DLL} ${EXIV2_DLL} ${LIBEXPAT_DLL} ${GLEW_DLL} ${GLUT_DLL}
 
186
        ${BOOST_THREAD_DLL} ${BOOST_DATE_TIME_DLL} ${BOOST_SYSTEM_DLL} ${BOOST_REGEX_DLL}
 
187
        ${EXIV2_DLL} ${LIBEXPAT_DLL} ${GLEW_DLL} ${GLUT_DLL}
185
188
        ${WXWIDGETS_DLL1} ${WXWIDGETS_DLL2} ${WXWIDGETS_DLL2} ${WXWIDGETS_DLL3}
186
189
        ${WXWIDGETS_DLL3} ${WXWIDGETS_DLL4} ${WXWIDGETS_DLL5} ${WXWIDGETS_DLL6}
187
190
        ${WXWIDGETS_DLL7}