Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

Commit 87108b2

Browse files
committed
Fixes related to #253: FreeBSD build
1 parent e4cff18 commit 87108b2

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

cmake_modules/FindLibClang.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ endforeach()
6060
find_path(LIBCLANG_INCLUDE_DIR clang-c/Index.h
6161
PATHS ${libclang_llvm_header_search_paths}
6262
PATH_SUFFIXES LLVM/include #Windows package from http://llvm.org/releases/
63+
llvm33/include llvm34/include llvm35/include llvm36/include llvm37/include llvm38/include llvm39/include # FreeBSD
6364
DOC "The path to the directory that contains clang-c/Index.h")
6465

6566
# On Windows with MSVC, the import library uses the ".imp" file extension
@@ -73,6 +74,7 @@ endif()
7374
find_library(LIBCLANG_LIBRARY NAMES libclang.imp libclang clang
7475
PATHS ${libclang_llvm_lib_search_paths}
7576
PATH_SUFFIXES LLVM/lib #Windows package from http://llvm.org/releases/
77+
llvm33/lib llvm34/lib llvm35/lib llvm36/lib llvm37/lib llvm38/lib llvm39/lib # FreeBSD
7678
DOC "The file that corresponds to the libclang library.")
7779

7880
get_filename_component(LIBCLANG_LIBRARY_DIR ${LIBCLANG_LIBRARY} PATH)

src/directories.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ void Directories::add_or_update_path(const boost::filesystem::path &dir_path, co
542542
if(path_it==directories.end()) {
543543
auto g_file=Glib::wrap(g_file_new_for_path(dir_path.string().c_str())); //TODO: report missing constructor in giomm
544544

545-
#if GLIB_CHECK_VERSION(2, 44, 0)
545+
#if GLIBMM_MAJOR_VERSION>2 || (GLIBMM_MAJOR_VERSION==2 && GLIBMM_MINOR_VERSION>=44)
546546
auto monitor=g_file->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_WATCH_MOVES);
547547
#else
548548
auto monitor=g_file->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_SEND_MOVED);

src/git.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Git::Repository::Repository(const boost::filesystem::path &path) {
104104

105105
auto git_path_str=boost::filesystem::canonical(get_path()).string();
106106
auto git_directory=Glib::wrap(g_file_new_for_path(git_path_str.c_str())); //TODO: report missing constructor in giomm
107-
#if GLIB_CHECK_VERSION(2, 44, 0)
107+
#if GLIBMM_MAJOR_VERSION>2 || (GLIBMM_MAJOR_VERSION==2 && GLIBMM_MINOR_VERSION>=44)
108108
monitor=git_directory->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_WATCH_MOVES);
109109
#else
110110
monitor=git_directory->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_SEND_MOVED);

0 commit comments

Comments
 (0)