Skip to content

Commit

Permalink
refs #5103. Should put VC runtime libs in right place.
Browse files Browse the repository at this point in the history
Should also remove some of the directories not required upon the thrid party dll directory copy.
  • Loading branch information
OwenArnold committed Apr 30, 2012
1 parent df5b30d commit 9d2659d
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion Code/Mantid/Build/CMake/WindowsNSIS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,17 @@
install ( FILES "${CMAKE_CURRENT_BINARY_DIR}/bin/${WINDOWS_DEPLOYMENT_TYPE}/MantidCurveFitting.lib" DESTINATION UserAlgorithms)
install ( FILES ${CMAKE_LIBRARY_PATH}/PocoFoundation.lib ${CMAKE_LIBRARY_PATH}/PocoXML.lib ${CMAKE_LIBRARY_PATH}/boost_date_time-vc100-mt-1_43.lib DESTINATION UserAlgorithms)

#Copy runtime libraries
install (FILES ${CMAKE_LIBRARY_PATH}/CRT/msvcp100.dll ${CMAKE_LIBRARY_PATH}/CRT/msvcr100.dll ${CMAKE_LIBRARY_PATH}/CRT/vcomp100.dll DESTINATION bin)

# Copy third party dlls excluding selected Qt ones and debug ones
install ( DIRECTORY ${CMAKE_LIBRARY_PATH}/ DESTINATION bin FILES_MATCHING PATTERN "*.dll" REGEX "(QtDesigner4.dll)|(QtDesignerComponents4.dll)|(QtScript4.dll)|(-gd-)|(d4.dll)|(_d.dll)" EXCLUDE PATTERN ".git" EXCLUDE )
install ( DIRECTORY ${CMAKE_LIBRARY_PATH}/ DESTINATION bin FILES_MATCHING PATTERN "*.dll"
REGEX "${CMAKE_LIBRARY_PATH}/CRT/*" EXCLUDE
REGEX "${CMAKE_LIBRARY_PATH}/Python27/*" EXCLUDE
REGEX "${CMAKE_LIBRARY_PATH}/qt_plugins/*" EXCLUDE
REGEX "(QtDesigner4.dll)|(QtDesignerComponents4.dll)|(QtScript4.dll)|(-gd-)|(d4.dll)|(_d.dll)"
EXCLUDE
PATTERN ".git" EXCLUDE )

#set(CPACK_NSIS_ON_INIT "Exec $INSTDIR\\\\Uninstall.exe")

Expand Down

0 comments on commit 9d2659d

Please sign in to comment.