From c72b355c4c96ffbbdb4630236ec7a839bdfa4df0 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 22 Nov 2015 14:43:59 -0800 Subject: [PATCH] Temporary fix for libPNG --- hecl/extern/libpng/CMakeLists.txt | 8 ++++---- hecl/include/HECL/Runtime.hpp | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hecl/extern/libpng/CMakeLists.txt b/hecl/extern/libpng/CMakeLists.txt index 49ad89341..b5ddafa69 100644 --- a/hecl/extern/libpng/CMakeLists.txt +++ b/hecl/extern/libpng/CMakeLists.txt @@ -2,7 +2,7 @@ if(NOT WIN32 AND NOT APPLE) find_library(PNG_LIB png) endif() -if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND) +#if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND) message(STATUS "Using HECL's built-in libpng") include_directories(${ZLIB_INCLUDE_DIR}) add_library(png @@ -33,6 +33,6 @@ add_library(png set(PNG_LIB png CACHE PATH "PNG library" FORCE) set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE) -else() -find_path(LIBPNG_INCLUDE_DIR png.h) -endif() +#else() +#find_path(LIBPNG_INCLUDE_DIR png.h) +#endif() diff --git a/hecl/include/HECL/Runtime.hpp b/hecl/include/HECL/Runtime.hpp index 1d6df86ee..59f7c3526 100644 --- a/hecl/include/HECL/Runtime.hpp +++ b/hecl/include/HECL/Runtime.hpp @@ -25,6 +25,10 @@ class FileStoreManager public: FileStoreManager(const SystemString& domain); const SystemString& getDomain() const {return m_domain;} + /** + * @brief Returns the full path to the file store, including domain + * @return Full path to store e.g /home/foo/.hecl/bar + */ const SystemString& getStoreRoot() const {return m_storeRoot;} };