From dc80731bae3a8502a3bfa276fdb32b403c14002b Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Mon, 28 Mar 2011 18:20:27 +0200 Subject: [PATCH] Fixed install rules according to the new x86/x64 directories in extlibs --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5170745..f06b473a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,8 +74,13 @@ install(DIRECTORY include install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${CMAKE_ROOT}/Modules) install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR}) if(WINDOWS) - install(FILES extlibs/bin/libsndfile-1.dll DESTINATION bin) - install(FILES extlibs/bin/openal32.dll DESTINATION bin) + if(ARCH_32BITS) + install(FILES extlibs/bin/x86/libsndfile-1.dll DESTINATION bin) + install(FILES extlibs/bin/x86/openal32.dll DESTINATION bin) + else() + install(FILES extlibs/bin/x64/libsndfile-1.dll DESTINATION bin) + install(FILES extlibs/bin/x64/openal32.dll DESTINATION bin) + endif() elseif(MACOSX) install(DIRECTORY extlibs/libs-osx/Frameworks/sndfile.framework DESTINATION /Library/Frameworks PATTERN ".svn" EXCLUDE) endif()