Hugo Beauzée-Luyssen pushed to branch master at videolan / libvlcpp
Commits: f60d407c by Hugo Beauzée-Luyssen at 2017-07-05T10:49:47+02:00 Remove left-over cmake files - - - - - 4 changed files: - − cmake/FindLIBVLC.cmake - − cmake/cpp11.cmake - − cmake/vlcppConfig.cmake.in - − cmake/vlcppConfigVersion.cmake.in Changes: ===================================== cmake/FindLIBVLC.cmake deleted ===================================== --- a/cmake/FindLIBVLC.cmake +++ /dev/null @@ -1,86 +0,0 @@ - -# CMake module to search for LIBVLC (VLC library) -# Author: Rohit Yadav <[email protected]> -# -# If it's found it sets LIBVLC_FOUND to TRUE -# and following variables are set: -# LIBVLC_INCLUDE_DIR -# LIBVLC_LIBRARY - - -# FIND_PATH and FIND_LIBRARY normally search standard locations -# before the specified paths. To search non-standard paths first, -# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH -# and then again with no specified paths to search the default -# locations. When an earlier FIND_* succeeds, subsequent FIND_*s -# searching for the same item do nothing. - -#Put here path to custom location -#example: /home/user/vlc/include etc.. -FIND_PATH(LIBVLC_INCLUDE_DIR vlc/vlc.h - HINTS "$ENV{LIBVLC_INCLUDE_PATH}" - PATHS - #Mac OS and Contribs - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/include" - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/include/vlc" - # Env - "$ENV{LIB_DIR}/include" - "$ENV{LIB_DIR}/include/vlc" - # - "/usr/include" - "/usr/include/vlc" - "/usr/local/include" - "/usr/local/include/vlc" - #mingw - c:/msys/local/include - # MacOS install dir - /Applications/VLC.app/Contents/MacOS/include - ) -FIND_PATH(LIBVLC_INCLUDE_DIR PATHS "${CMAKE_INCLUDE_PATH}/vlc" NAMES vlc.h) - -#Put here path to custom location -#example: /home/user/vlc/lib etc.. -FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc libvlc - HINTS "$ENV{LIBVLC_LIBRARY_PATH}" - PATHS - "$ENV{LIB_DIR}/lib" - #Mac OS - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/lib" - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/plugins" - # MacOS install dir - /Applications/VLC.app/Contents/MacOS/lib - #mingw - c:/msys/local/lib - ) -FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc libvlc) -FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore - HINTS "$ENV{LIBVLC_LIBRARY_PATH}" - PATHS - "$ENV{LIB_DIR}/lib" - #Mac OS - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/lib" - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/plugins" - # MacOS install dir - /Applications/VLC.app/Contents/MacOS/lib - #mingw - c:/msys/local/lib - ) -FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore) - -IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY) - SET(LIBVLC_FOUND TRUE) -ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY) - -IF (LIBVLC_FOUND) - get_filename_component(LIBVLC_LIB_DIR ${LIBVLC_LIBRARY} PATH) - IF (NOT LIBVLC_FIND_QUIETLY) - MESSAGE(STATUS "Found LibVLC include-dir path: ${LIBVLC_INCLUDE_DIR}") - MESSAGE(STATUS "Found LibVLC library path:${LIBVLC_LIBRARY}") - MESSAGE(STATUS "Found LibVLCcore library path:${LIBVLCCORE_LIBRARY}") - ENDIF (NOT LIBVLC_FIND_QUIETLY) -ELSE (LIBVLC_FOUND) - IF (LIBVLC_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find LibVLC") - ENDIF (LIBVLC_FIND_REQUIRED) -ENDIF (LIBVLC_FOUND) - ===================================== cmake/cpp11.cmake deleted ===================================== --- a/cmake/cpp11.cmake +++ /dev/null @@ -1,13 +0,0 @@ -#Shamelessly taken from http://www.guyrutenberg.com/2014/01/05/enabling-c11-c0x-in-cmake/ -macro(EnableCpp11) - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) - CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) - if(COMPILER_SUPPORTS_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - elseif(COMPILER_SUPPORTS_CXX0X) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - else() - message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") - endif() -endmacro() ===================================== cmake/vlcppConfig.cmake.in deleted ===================================== --- a/cmake/vlcppConfig.cmake.in +++ /dev/null @@ -1,13 +0,0 @@ -# - Config file for the libvlcpp package -# It defines the following variables -# LIBVLCPP_INCLUDE_DIRS - include directories for libvlcpp -# LIBVLCPP_LIBRARIES - libraries to link against - -# Compute paths -get_filename_component(LIBVLCPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -set(LIBVLCPP_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") -FIND_LIBRARY(LIBVLCPP_LIBRARY vlcpp - PATHS @CMAKE_INSTALL_PREFIX@/lib/@PROJECT_NAME@ - NO_DEFAULT_PATH -) -SET(LIBVLCPP_LIBRARIES ${LIBVLCPP_LIBRARY}) ===================================== cmake/vlcppConfigVersion.cmake.in deleted ===================================== --- a/cmake/vlcppConfigVersion.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ -set(PACKAGE_VERSION "@LIBVLCPP_VERSION@") - -# Check whether the requested PACKAGE_FIND_VERSION is compatible -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() View it on GitLab: https://code.videolan.org/videolan/libvlcpp/commit/f60d407cc68cdd3ad7ea9b250780a3620e1652e9 --- View it on GitLab: https://code.videolan.org/videolan/libvlcpp/commit/f60d407cc68cdd3ad7ea9b250780a3620e1652e9 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
