# HG changeset patch # User unc0rr # Date 1346244142 -14400 # Node ID 172fb1c7615b70384bdee46296d6049eb0c2adb4 # Parent f0d739c34f2b79b1046dfebdd785ac48d5b1709f Fix library installation in win32 diff -r f0d739c34f2b -r 172fb1c7615b hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Wed Aug 29 08:40:26 2012 -0400 +++ b/hedgewars/CMakeLists.txt Wed Aug 29 16:42:22 2012 +0400 @@ -197,6 +197,7 @@ # there are some problems with linking our avwrapper as static lib, so link it as shared add_library(avwrapper SHARED avwrapper.c) target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) + install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avwrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION ${target_dir}) ELSE() add_library(avwrapper STATIC avwrapper.c) set(pascal_flags "-k${FFMPEG_LIBAVCODEC}" "-k${FFMPEG_LIBAVFORMAT}" "-k${FFMPEG_LIBAVUTIL}" ${pascal_flags}) @@ -256,6 +257,3 @@ # endif() install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir}) -IF (WIN32) - install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avwrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION ${target_dir}) -ENDIF()