From 60960709eb8e5e6e25cb396c457e125e58a1bfda Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Fri, 31 Jul 2015 15:47:59 -0600 Subject: loader: Allow null string for CMAKE_INSTALL_PREFIX to prevent extra paths NULL string was making loader search extra local paths such as /share/... Also expand log buffer . --- CMakeLists.txt | 1 + loader/loader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd594c2d..9a21f0e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ if(NOT WIN32) add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_SYSCONFDIR}") add_definitions(-DDATADIR="${CMAKE_INSTALL_DATADIR}") if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") + elseif (CMAKE_INSTALL_PREFIX STREQUAL "") else() add_definitions(-DLOCALPREFIX="${CMAKE_INSTALL_PREFIX}") endif() diff --git a/loader/loader.c b/loader/loader.c index 06c86f61..60541f6f 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -151,7 +151,7 @@ void loader_heap_free( static void loader_log(VkFlags msg_type, int32_t msg_code, const char *format, ...) { - char msg[256]; + char msg[512]; va_list ap; int ret; -- cgit v1.2.3