From f5f632ef748e568d8eb8d33495070fbf6f91f569 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Tue, 2 Mar 2010 19:00:31 +0000 Subject: [PATCH] Some install changes to CMakeLists.txt SVN-Revision: 6519 --- CMakeLists.txt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cde79754d..c7079261f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,14 +355,8 @@ IF(WIN32 AND NOT UNIX) SET(INSTALL_SUBDIR_SHARE "data" CACHE STRING "Installation subdir for data") SET(INSTALL_SUBDIR_DOC "." CACHE STRING "Installation subdir for docs") - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SDL.dll - ${CMAKE_CURRENT_SOURCE_DIR}/SDL_image.dll - ${CMAKE_CURRENT_SOURCE_DIR}/iconv.dll - ${CMAKE_CURRENT_SOURCE_DIR}/libogg-0.dll - ${CMAKE_CURRENT_SOURCE_DIR}/libphysfs-1-0-0.dll - ${CMAKE_CURRENT_SOURCE_DIR}/OpenAl32.dll - ${CMAKE_CURRENT_SOURCE_DIR}/wrap_oal.dll - ${CMAKE_CURRENT_SOURCE_DIR}/libcurl-4.dll DESTINATION ${INSTALL_SUBDIR_BIN}) + FILE(GLOB DLLS "${CMAKE_CURRENT_SOURCE_DIR}/*.dll") + INSTALL(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION ".") @@ -433,7 +427,7 @@ ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") SET(CPACK_PACKAGE_VERSION_MAJOR "0") SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "2-SVN") +SET(CPACK_PACKAGE_VERSION_PATCH "3-SVN") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "SuperTux ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_PACKAGE_EXECUTABLES "..\\\\supertux2" "SuperTux ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") IF(WIN32 AND NOT UNIX) -- 2.11.0