[vlmc-devel] Remove our old contrib system
Hugo Beauzée-Luyssen
git at videolan.org
Tue Aug 2 01:00:14 CEST 2016
vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Jul 18 09:29:09 2016 +0200| [aac2b52fb830b02a99ead3a531e5dbc18ebb0a37] | committer: Hugo Beauzée-Luyssen
Remove our old contrib system
> https://code.videolan.org/videolan/vlmc/commit/aac2b52fb830b02a99ead3a531e5dbc18ebb0a37
---
CMakeLists.txt | 1 -
contribs/CMakeLists.txt | 17 -----------------
src/CMakeLists.txt | 1 -
3 files changed, 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ccaab..7b2c7d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,6 @@ IF (UNIX)
ENDIF (UNIX)
include(ts/translations.cmake)
-subdirs(contribs)
SUBDIRS(src)
SUBDIRS(nsis)
SUBDIRS(effects)
diff --git a/contribs/CMakeLists.txt b/contribs/CMakeLists.txt
deleted file mode 100644
index ad93d1e..0000000
--- a/contribs/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-project(vlmc)
-
-include(ExternalProject)
-
-set( PREFIX ${PROJECT_BINARY_DIR}/contribs )
-set( CONTRIBS_DIR ${PREFIX}/install PARENT_SCOPE )
-
-# Find libvlcpp
-ExternalProject_Add(
- libvlcpp
- PREFIX ${PREFIX}
- UPDATE_COMMAND ""
- GIT_REPOSITORY https://code.videolan.org/videolan/libvlcpp.git
- CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap && <SOURCE_DIR>/configure --prefix=${PREFIX}/install --disable-examples
- BUILD_COMMAND make
- INSTALL_COMMAND make install
-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b37f38..62a1147 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -286,7 +286,6 @@ ELSE(NOT WITH_GUI)
endif()
ENDIF( NOT WITH_GUI )
-add_dependencies(vlmc libvlcpp)
message(STATUS "Contribs prefix: ${CONTRIBS_DIR}")
include_directories( ${CONTRIBS_DIR}/include )
More information about the Vlmc-devel
mailing list