From 084a7a289a227a9b5e39aa17a875e0c2257a1855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 21 Dec 2010 08:52:43 +0000 Subject: [PATCH] Copy glut32 on windows to installer and if doc target has been build, add it to installer too git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@355 fdac6126-5c0c-442c-9429-916003d36597 --- cmake/OpenMeshPackage.cmake | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/cmake/OpenMeshPackage.cmake b/cmake/OpenMeshPackage.cmake index 0ab35cc7..ccf87e9a 100644 --- a/cmake/OpenMeshPackage.cmake +++ b/cmake/OpenMeshPackage.cmake @@ -89,13 +89,6 @@ if (WIN32) # TODO: fillme # set (CPACK_NSIS_CONTACT "") - #set (CPACK_NSIS_CREATE_ICONS - # "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\OpenFlipper.lnk\\\" \\\"$INSTDIR\\\\OpenFlipper.exe\\\"" - # ) - #set (CPACK_NSIS_DELETE_ICONS - # "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\OpenFlipper.lnk\\\"" - # ) - # Copy all shared Qt files to build binary dir if ( NOT Q_WS_MAC) if (DEFINED QT_QMAKE_EXECUTABLE) @@ -125,6 +118,27 @@ if (WIN32) endif(DEFINED QT_QMAKE_EXECUTABLE) endif() + # copy the glut library if it exists on windows + IF ( WIN32) + if (EXISTS ${CMAKE_BINARY_DIR}/Build/glut32.dll) + install(FILES ${CMAKE_BINARY_DIR}/Build/glut32.dll + DESTINATION ./ + COMPONENT Applications + ) + endif() + endif() + + # copy the documentation if it exists + IF ( WIN32) + if (EXISTS ${CMAKE_BINARY_DIR}/Build/Doc) + install(DIRECTORY ${CMAKE_BINARY_DIR}/Build/Doc + DESTINATION ./ + COMPONENT Applications + ) + endif() + endif() + + # append dll's to installed package #if (EXISTS ${CMAKE_SOURCE_DIR}/WIN) #file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 debug/*.dll") -- GitLab