p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Fix Debian build

This commit is contained in:
Přemysl Eric Janouch 2015-01-20 07:40:46 +01:00
parent 616650c558
commit adead30747
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -245,7 +245,7 @@ set_target_properties (liblogdiag PROPERTIES OUTPUT_NAME logdiag)
# Build the executable # Build the executable
add_executable (logdiag WIN32 ${logdiag_SOURCES} ${logdiag_HEADERS}) add_executable (logdiag WIN32 ${logdiag_SOURCES} ${logdiag_HEADERS})
target_link_libraries (logdiag liblogdiag ${logdiag_LIBS}) target_link_libraries (logdiag liblogdiag m ${logdiag_LIBS})
# Testing # Testing
option (BUILD_TESTING "Build tests" OFF) option (BUILD_TESTING "Build tests" OFF)

6
cmake/FindJsonGlib.cmake
View File

@ -36,8 +36,12 @@ find_path (JSON_GLIB_INCLUDE_DIR json-glib/json-glib.h
find_path (JSON_GLIB_INCLUDE_DIR_GOBJECT glib-object.h find_path (JSON_GLIB_INCLUDE_DIR_GOBJECT glib-object.h
PATH_SUFFIXES glib-2.0) PATH_SUFFIXES glib-2.0)
if (CMAKE_LIBRARY_ARCHITECTURE)
set (_json_glib_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
endif (CMAKE_LIBRARY_ARCHITECTURE)
find_path (JSON_GLIB_INCLUDE_DIR_GLIBCONFIG glibconfig.h find_path (JSON_GLIB_INCLUDE_DIR_GLIBCONFIG glibconfig.h
PATHS /usr/lib PATHS ${_json_glib_arch_dir} /usr/lib
PATH_SUFFIXES glib-2.0 glib-2.0/include) PATH_SUFFIXES glib-2.0 glib-2.0/include)
find_library (JSON_GLIB_LIBRARIES json-glib-1.0) find_library (JSON_GLIB_LIBRARIES json-glib-1.0)