fix cmakelist on windows

This commit is contained in:
jfmcarreira committed 2014-11-17 00:03:47 +00:00
1 parent 2a2d3b75c8
commit 385440c86d
2 files changed
+8 -5

No files matched your search

+4 -5
View File
@@ -60,6 +60,10 @@ IF( USE_FFMPEG )
ENDIF()
SET_PACKAGE_PROPERTIES(FFmpeg PROPERTIES URL "http://ffmpeg.org/" DESCRIPTION "Libav library support in PlaYUVerStream" TYPE OPTIONAL)
IF( WIN32 )
INCLUDE( cmake/Win32.cmake )
ENDIF()
#####################################################################################
# Qt library
######################################################################################
@@ -113,11 +117,6 @@ ADD_SUBDIRECTORY( lib )
ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY( app )
IF( WIN32 )
INCLUDE( cmake/Win32.cmake )
ENDIF()
######################################################################################
# Create deb package
+4
View File
@@ -2,6 +2,10 @@
# DLLs and Win32 specific code
######################################################################################
if (MSVC_IDE)
# hack to get around the "Debug" and "Release" directories cmake tries to add on Windows
set_target_properties (${PROJECT_NAME} PROPERTIES PREFIX "../")
endif()
SET(MSVC_DLL_DIR "MSVC_DLL_DIR" CACHE PATH "Where to find MSVC dlls")
INSTALL(FILES ${MSVC_DLL_DIR}/msvcr120.dll DESTINATION bin )