Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "SYSTEM" from the include_directories() CMakeLists.txt entries #561

Merged
merged 1 commit into from
Feb 21, 2020
Merged

Remove "SYSTEM" from the include_directories() CMakeLists.txt entries #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ endif()

# Check for FUSE.
find_package (FUSE REQUIRED)
include_directories (SYSTEM ${FUSE_INCLUDE_DIR})
include_directories (${FUSE_INCLUDE_DIR})
add_definitions (-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=29)
if (CYGWIN)
# Cygwin build is intended to use WinFsp
Expand All @@ -105,7 +105,7 @@ endif()

# Check for OpenSSL.
find_package (OpenSSL REQUIRED)
include_directories (SYSTEM ${OPENSSL_INCLUDE_DIR})
include_directories (${OPENSSL_INCLUDE_DIR})

find_program (POD2MAN pod2man)

Expand Down Expand Up @@ -187,7 +187,7 @@ include_directories (${CMAKE_CURRENT_LIST_DIR})
if (ENABLE_NLS)
find_package (Intl)
if (Intl_FOUND)
include_directories (SYSTEM ${Intl_INCLUDE_DIRS})
include_directories (${Intl_INCLUDE_DIRS})
endif()

add_subdirectory(po)
Expand Down Expand Up @@ -236,25 +236,25 @@ if (USE_INTERNAL_TINYXML)
endif ()
set(BUILD_TESTS OFF CACHE BOOL "build tests")
add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL)
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR})
else ()
find_package (TinyXML REQUIRED)
include_directories (SYSTEM ${TINYXML_INCLUDE_DIR})
include_directories (${TINYXML_INCLUDE_DIR})
endif ()

if (USE_INTERNAL_EASYLOGGING)
message("-- Using vendored Easylogging++")
set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp)
set(build_static_lib ON CACHE BOOL "build static libs")
add_subdirectory(${EASYLOGGING_DIR} EXCLUDE_FROM_ALL)
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src)
include_directories(${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src)
link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR})
set(EASYLOGGINGPP_LIBRARY easyloggingpp)
else ()
set(EASYLOGGINGPP_USE_SHARED_LIBS ON CACHE BOOL "look for shared lib")
find_package (EASYLOGGINGPP REQUIRED)
include_directories (SYSTEM ${EASYLOGGINGPP_INCLUDE_DIR})
include_directories (${EASYLOGGINGPP_INCLUDE_DIR})
endif ()

set(SOURCE_FILES
Expand Down