aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorWohlstand <admin@wohlnet.ru>2018-10-18 01:29:53 +0300
committerWohlstand <admin@wohlnet.ru>2018-10-18 01:29:53 +0300
commitfad5d84ce47ad2b37867e82275cca1bc48f3e4c8 (patch)
treef719980c93bd1ecca2b6c7662f39d781f522c234 /cmake
parentca66330f20ff0dd6e16b47455b532bc0323c0a92 (diff)
downloadlibADLMIDI-fad5d84ce47ad2b37867e82275cca1bc48f3e4c8.tar.gz
libADLMIDI-fad5d84ce47ad2b37867e82275cca1bc48f3e4c8.tar.bz2
libADLMIDI-fad5d84ce47ad2b37867e82275cca1bc48f3e4c8.zip
VLC: Small fix of the findVLC on Windows
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindLIBVLC.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/FindLIBVLC.cmake b/cmake/FindLIBVLC.cmake
index ea26329..f023c80 100644
--- a/cmake/FindLIBVLC.cmake
+++ b/cmake/FindLIBVLC.cmake
@@ -46,7 +46,7 @@ else()
-D_THREAD_SAFE
)
# FIXME: Put the proper install path here
- set(VLCPLUGIN_CODEC_INSTALL_PATH "C:/Program Files/vlc/plugins/codec")
+ set(VLCPLUGIN_CODEC_INSTALL_PATH "C:/Program Files/VideoLAN/VLC/plugins/codec")
endif()
#Put here path to custom location
@@ -61,6 +61,7 @@ PATHS
"/usr/local/include"
"/usr/local/include/vlc"
#mingw
+ ${CMAKE_PREFIX_PATH}/include
c:/msys/local/include
)
find_path(LIBVLC_INCLUDE_DIR PATHS "${CMAKE_INCLUDE_PATH}/vlc" NAMES vlc.h
@@ -73,6 +74,7 @@ HINTS "$ENV{LIBVLC_LIBRARY_PATH}" ${PC_LIBVLC_LIBDIR} ${PC_LIBVLC_LIBRARY_DIRS}
PATHS
"$ENV{LIB_DIR}/lib"
#mingw
+ ${CMAKE_PREFIX_PATH}/lib
c:/msys/local/lib
)
find_library(LIBVLC_LIBRARY NAMES vlc libvlc)
@@ -81,6 +83,7 @@ HINTS "$ENV{LIBVLC_LIBRARY_PATH}" ${PC_LIBVLC_LIBDIR} ${PC_LIBVLC_LIBRARY_DIRS}
PATHS
"$ENV{LIB_DIR}/lib"
#mingw
+ ${CMAKE_PREFIX_PATH}/lib
c:/msys/local/lib
)
find_library(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore)