From a85df931d29ee4cb86bbea6eef60fb08c90e3002 Mon Sep 17 00:00:00 2001 From: Yuchen Deng Date: Sat, 7 Apr 2018 11:38:31 +0800 Subject: [PATCH 1/2] Fix linker error on Debian 9 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3566ec4c..ac548dcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,7 +128,7 @@ if(UNIX) include(FindFreetype) if(FREETYPE_FOUND) include_directories( ${FREETYPE_INCLUDE_DIRS}) - list(APPEND NANA_LINKS -lXft) + list(APPEND NANA_LINKS -lXft -lfontconfig) endif() endif() From 5df162c449681db2708328b0416fc1f81cefc65e Mon Sep 17 00:00:00 2001 From: Yuchen Deng Date: Sat, 7 Apr 2018 17:42:03 +0800 Subject: [PATCH 2/2] Add compile_commands.json to .gitignore --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4f8de9b3..e5d2f0b7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ bii/cmake/* bii/deps/* build/vc2013-bkl/* build/makefile-bkl/* +build/compile_commands.json *.obj *.exe *.pdb @@ -44,6 +45,6 @@ cmake-build-debug/ cmake_install.cmake *.DS_Store -*.db -*.opendb -.vscode \ No newline at end of file +*.db +*.opendb +.vscode