[vlmc-devel] cmake: Move Qt stuff to src/CMakeLists.txt
Hugo Beauzée-Luyssen
git at videolan.org
Fri Apr 1 23:56:17 CEST 2016
vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr 1 23:32:46 2016 +0200| [37b0e008b8cb2ddec99ee1fbcbcb550e58a4354c] | committer: Hugo Beauzée-Luyssen
cmake: Move Qt stuff to src/CMakeLists.txt
> https://code.videolan.org/videolan/vlmc/commit/37b0e008b8cb2ddec99ee1fbcbcb550e58a4354c
---
CMakeLists.txt | 14 --------------
src/CMakeLists.txt | 15 +++++++++++++++
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c9ca9..87c8f33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,20 +106,6 @@ endif()
INCLUDE_DIRECTORIES(${FREI0R_INCLUDE_DIR})
-# Manually set Qt5 path for OSX installed using brew
-SET(CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
-
-# search for Qt5
-find_package(Qt5Core QUIET)
-if (Qt5Core_FOUND)
- # go on with other packages
- if(WITH_GUI)
- find_package(Qt5 COMPONENTS Widgets Gui Xml Network)
- else()
- find_packages(Qt5 COMPONENTS Xml Network)
- endif()
-endif()
-
# 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 dc5e0d7..7abb472 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,21 @@
#check if version will support target_compile_features command
#to ensure we can use some C++11 featrues
cmake_minimum_required(VERSION 3.1)
+
+# Manually set Qt5 path for OSX installed using brew
+SET(CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
+
+# search for Qt5
+find_package(Qt5Core QUIET)
+if (Qt5Core_FOUND)
+ # go on with other packages
+ if(WITH_GUI)
+ find_package(Qt5 COMPONENTS Widgets Gui Xml Network)
+ else()
+ find_packages(Qt5 COMPONENTS Xml Network)
+ endif()
+endif()
+
SET(VLMC_SRCS
Commands/Commands.cpp
Backend/IBackend.h
More information about the Vlmc-devel
mailing list