Commit f1688c70 authored by Jan Möbius's avatar Jan Möbius

INstall dlls from build dir, fix missing vcredist not included in installer

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@10661 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 405fefc8
......@@ -169,24 +169,24 @@ if (WIN32)
set (CPACK_NSIS_DELETE_ICONS
"Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\OpenFlipper.lnk\\\""
)
file (GLOB _files "${CMAKE_BINARY_DIR}/Build/*.dll")
install(FILES ${_files}
DESTINATION ${ACG_PROJECT_BINDIR}
)
# append dll's to installed package
if (EXISTS ${CMAKE_SOURCE_DIR}/WIN)
file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 debug/*.dll")
install(FILES ${_files}
DESTINATION ${ACG_PROJECT_BINDIR}
CONFIGURATIONS Debug
)
file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 release/*.dll")
install (FILES ${_files}
DESTINATION ${ACG_PROJECT_BINDIR}
CONFIGURATIONS Release
)
install (FILES "${CMAKE_SOURCE_DIR}/WIN/DLLs/Redistributables/Visual Studio 2008/vcredist_x86.exe"
if (EXISTS "${CMAKE_SOURCE_DIR}/win/vcredist_x86.exe")
install (FILES "${CMAKE_SOURCE_DIR}/win/vcredist_x86.exe"
DESTINATION ${ACG_PROJECT_BINDIR}
)
set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q:a'")
else()
message("Warning! No vcredist_x86 found. Please copy it to a directory called win in your source tree!!")
endif ()
elseif (APPLE)
if ( EXISTS ${CMAKE_SOURCE_DIR}/branding )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment