[vlmc-devel] cmake: Move include/package code into src/CMakeLists.txt

Hugo Beauzée-Luyssen git at videolan.org
Fri Apr 1 23:56:18 CEST 2016


vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr  1 23:35:37 2016 +0200| [29c0516c4ce7eabbac030c563d9b4fc0acaddbdc] | committer: Hugo Beauzée-Luyssen

cmake: Move include/package code into src/CMakeLists.txt

> https://code.videolan.org/videolan/vlmc/commit/29c0516c4ce7eabbac030c563d9b4fc0acaddbdc
---

 CMakeLists.txt     | 13 -------------
 src/CMakeLists.txt | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87c8f33..7e7e5b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,19 +93,6 @@ SET(WITH_CRASHBUTTON FALSE CACHE BOOL "Enable the crash button")
 SET(WITH_CRASHHANDLER_GUI FALSE CACHE BOOL "Enable the crash handler GUI (with backtrace and restart capabilities)")
 SET(WITH_CRASHHANDLER FALSE CACHE BOOL "Enable the crash handler")
 
-FIND_PACKAGE(LIBVLC REQUIRED)
-list(APPEND VLMC_LIBS ${LIBVLC_LIBRARY} ${LIBVLCCORE_LIBRARY})
-INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
-
-FIND_PACKAGE(frei0r REQUIRED)
-
-if(APPLE)
-    find_library(FOUNDATION_FRAMEWORK Foundation)
-    find_library(APPKIT_FRAMEWORK AppKit)
-endif()
-
-INCLUDE_DIRECTORIES(${FREI0R_INCLUDE_DIR})
-
 # layout of VLMC installation
 # (default values are platform-specific)
 SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7abb472..6a6b785 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,19 @@ if (Qt5Core_FOUND)
     endif()
 endif()
 
+FIND_PACKAGE(LIBVLC REQUIRED)
+list(APPEND VLMC_LIBS ${LIBVLC_LIBRARY} ${LIBVLCCORE_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
+
+FIND_PACKAGE(frei0r REQUIRED)
+
+if(APPLE)
+    find_library(FOUNDATION_FRAMEWORK Foundation)
+    find_library(APPKIT_FRAMEWORK AppKit)
+endif()
+
+INCLUDE_DIRECTORIES(${FREI0R_INCLUDE_DIR})
+
 SET(VLMC_SRCS
     Commands/Commands.cpp
     Backend/IBackend.h



More information about the Vlmc-devel mailing list