[Chinese-commits] [fqterm] 22/34: Move ``find_package(OpenSSL)`` to protocol/CMakeLists.txt

Boyuan Yang hosiet-guest at moszumanska.debian.org
Tue Nov 1 06:06:07 UTC 2016


This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit e2247862eab2782e61af505b1a5656831ec6a5f0
Author: Iru Cai <mytbk920423 at gmail.com>
Date:   Wed Oct 26 14:17:15 2016 +0800

    Move ``find_package(OpenSSL)`` to protocol/CMakeLists.txt
    
    Files in ``protocol`` directory need ${OPENSSL_INCLUDE_DIR}, but this
    include is not done when building in this directory if the
    find_package statement is in ${SRC_ROOT}/CMakeLists.txt.*.
---
 CMakeLists.txt.freebsd      | 1 -
 CMakeLists.txt.linux        | 1 -
 CMakeLists.txt.macos        | 2 --
 CMakeLists.txt.mingw        | 1 -
 src/protocol/CMakeLists.txt | 1 +
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CMakeLists.txt.freebsd b/CMakeLists.txt.freebsd
index 4970568..e8c1317 100644
--- a/CMakeLists.txt.freebsd
+++ b/CMakeLists.txt.freebsd
@@ -1,4 +1,3 @@
-find_package(OpenSSL REQUIRED)
 find_package(OSS)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
diff --git a/CMakeLists.txt.linux b/CMakeLists.txt.linux
index 1bef176..1535dc5 100644
--- a/CMakeLists.txt.linux
+++ b/CMakeLists.txt.linux
@@ -1,4 +1,3 @@
-find_package(OpenSSL REQUIRED)
 find_package(ALSA)
 find_package(OSS)
 
diff --git a/CMakeLists.txt.macos b/CMakeLists.txt.macos
index bc972df..a192b92 100644
--- a/CMakeLists.txt.macos
+++ b/CMakeLists.txt.macos
@@ -1,5 +1,3 @@
-find_package(OpenSSL REQUIRED)
-
 ADD_DEFINITIONS(-Wall)
 
 if(FQTERM_USE_STATIC_QT)
diff --git a/CMakeLists.txt.mingw b/CMakeLists.txt.mingw
index 9163144..b0fc8c1 100644
--- a/CMakeLists.txt.mingw
+++ b/CMakeLists.txt.mingw
@@ -1,4 +1,3 @@
-find_package(OpenSSL REQUIRED)
 #ADD_DEFINITIONS(-DUSE_DOTNET_STYLE)
 
 if(FQTERM_USE_STATIC_QT)
diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt
index c6cf81d..cd7d2f4 100644
--- a/src/protocol/CMakeLists.txt
+++ b/src/protocol/CMakeLists.txt
@@ -1,3 +1,4 @@
+find_package(OpenSSL REQUIRED)
 set(CMAKE_AUTOMOC ON)
 
 set(export_SRCS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git



More information about the Chinese-commits mailing list