From dfcb4e42fd61a295c6c0e60a62088c34fd139f76 Mon Sep 17 00:00:00 2001 From: "greg.hellings" Date: Tue, 28 Jul 2020 13:57:41 +0000 Subject: [PATCH] Simplify finding libraries Don't make dependent libraries required for MSVC that aren't actually required git-svn-id: https://crosswire.org/svn/sword/trunk@3773 bcd7d363-81e1-0310-97ec-a550e20fc99c --- CMakeLists.txt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97ee78f1b..9672f9e73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,18 +47,11 @@ ENDIF(MSVC) # MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES") # Find our packages -IF(MSVC) - FIND_PACKAGE(BZIP2 REQUIRED) - FIND_PACKAGE(XZ REQUIRED) - FIND_PACKAGE(ICU REQUIRED) - FIND_PACKAGE(CURL REQUIRED) -ELSE(MSVC) - FIND_PACKAGE(BZIP2 QUIET) - FIND_PACKAGE(XZ QUIET) - FIND_PACKAGE(ICU - COMPONENTS data i18n io uc) - FIND_PACKAGE(CURL QUIET) -ENDIF(MSVC) +FIND_PACKAGE(BZIP2 QUIET) +FIND_PACKAGE(XZ QUIET) +FIND_PACKAGE(ICU + COMPONENTS data i18n io uc) +FIND_PACKAGE(CURL QUIET) FIND_PACKAGE(CLucene QUIET) FIND_PACKAGE(ZLIB QUIET) FIND_PACKAGE(PkgConfig QUIET)