From 0a3f7ea1b9ceecd6635832924e3cd50b38e75546 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 24 May 2008 18:30:29 +0000 Subject: [PATCH] (cmake build) Install DLL files to correct locations on Windows. svn path=/trunk/yasm/; revision=2102 --- libyasm/CMakeLists.txt | 1 + modules/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libyasm/CMakeLists.txt b/libyasm/CMakeLists.txt index 125afa0d..f886f734 100644 --- a/libyasm/CMakeLists.txt +++ b/libyasm/CMakeLists.txt @@ -37,6 +37,7 @@ SET_TARGET_PROPERTIES(libyasm PROPERTIES ) INSTALL(TARGETS libyasm + RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index ebb7b6d6..48a3b5cf 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -86,4 +86,8 @@ ADD_LIBRARY(yasmstd MODULE ) TARGET_LINK_LIBRARIES(yasmstd libyasm) -INSTALL(TARGETS yasmstd LIBRARY DESTINATION lib) +IF(WIN32) + INSTALL(TARGETS yasmstd LIBRARY DESTINATION bin) +ELSE(WIN32) + INSTALL(TARGETS yasmstd LIBRARY DESTINATION lib) +ENDIF(WIN32)