diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2015-01-20 07:40:46 +0100 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2015-01-20 07:40:46 +0100 |
| commit | adead30747b398ea52abe6286c12164870816f2e (patch) | |
| tree | 41d6996007ea1fbe5a115ab0a7f13678ecd49e12 | |
| parent | 616650c55802f3eda39ffb2c0a95fd90a17f9ceb (diff) | |
| download | logdiag-adead30747b398ea52abe6286c12164870816f2e.tar.gz logdiag-adead30747b398ea52abe6286c12164870816f2e.tar.xz logdiag-adead30747b398ea52abe6286c12164870816f2e.zip | |
Fix Debian build
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/FindJsonGlib.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b01a60..a849450 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,7 @@ set_target_properties (liblogdiag PROPERTIES OUTPUT_NAME logdiag) # Build the executable add_executable (logdiag WIN32 ${logdiag_SOURCES} ${logdiag_HEADERS}) -target_link_libraries (logdiag liblogdiag ${logdiag_LIBS}) +target_link_libraries (logdiag liblogdiag m ${logdiag_LIBS}) # Testing option (BUILD_TESTING "Build tests" OFF) diff --git a/cmake/FindJsonGlib.cmake b/cmake/FindJsonGlib.cmake index ab19c10..c279de1 100644 --- a/cmake/FindJsonGlib.cmake +++ b/cmake/FindJsonGlib.cmake @@ -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 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 - PATHS /usr/lib + PATHS ${_json_glib_arch_dir} /usr/lib PATH_SUFFIXES glib-2.0 glib-2.0/include) find_library (JSON_GLIB_LIBRARIES json-glib-1.0) |