Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix library installation in win32
authorunc0rr
Wed, 29 Aug 2012 16:42:22 +0400
changeset 7622 172fb1c7615b
parent 7621 f0d739c34f2b
child 7623 addc5b262617
Fix library installation in win32
hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- 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()
hedgewars