diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-07-19 15:23:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-07-19 15:23:47 +0900 |
| commit | eccae8f56589504832939ead309248dfb8b2d9af (patch) | |
| tree | b37891cdb797cdf93aa637b8141d9d443d059c4b | |
| parent | 35b683a741ce46cb59ef380b2e3fffd567bec5ec (diff) | |
| download | tde-ebook-reader-eccae8f56589504832939ead309248dfb8b2d9af.tar.gz tde-ebook-reader-eccae8f56589504832939ead309248dfb8b2d9af.zip | |
Fix loading of ZLibrary resources
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | zlibrary/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | zlibrary/core/include/ZLibrary.h | 2 | ||||
| -rw-r--r-- | zlibrary/core/src/library/ZLibrary.cpp | 2 |
4 files changed, 20 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5568df4..0e62764 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,24 @@ include( TDESetupPaths ) tde_setup_paths( ) +##### zlibrary-tqt paths + +_tde_internal_setup_path( + ZL_SHARE_INSTALL_PREFIX "${CMAKE_ZLIBRARY_INSTALL_PREFIX}/share/zlibrary-tqt" + "Base directory for zlibrary-tqt files which go to share" +) + +_tde_internal_setup_path( + ZL_INCLUDE_INSTALL_DIR "${CMAKE_ZLIBRARY_INSTALL_PREFIX}/include/zlibrary-tqt" + "The subdirectory to the header prefix" +) + +_tde_internal_setup_path( + ZL_LIB_INSTALL_DIR "${CMAKE_ZLIBRARY_INSTALL_PREFIX}/lib${LIB_SUFFIX}" + "Base directory for zlibrary-tqt lib files" +) + + ##### optional stuff option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) diff --git a/zlibrary/CMakeLists.txt b/zlibrary/CMakeLists.txt index d4cba6c..69df9d9 100644 --- a/zlibrary/CMakeLists.txt +++ b/zlibrary/CMakeLists.txt @@ -1,22 +1,2 @@ - -##### zlibrary-tqt install path - -_tde_internal_setup_path( - ZL_SHARE_INSTALL_PREFIX "${CMAKE_ZLIBRARY_INSTALL_PREFIX}/share/zlibrary-tqt" - "Base directory for zlibrary-tqt files which go to share" -) - -_tde_internal_setup_path( - ZL_INCLUDE_INSTALL_DIR "${CMAKE_ZLIBRARY_INSTALL_PREFIX}/include/zlibrary-tqt" - "The subdirectory to the header prefix" -) - -_tde_internal_setup_path( - ZL_LIB_INSTALL_DIR "${CMAKE_ZLIBRARY_INSTALL_PREFIX}/lib${LIB_SUFFIX}" - "Base directory for zlibrary-tqt lib files" -) - -##### subfolders - add_subdirectory( core ) add_subdirectory( text ) diff --git a/zlibrary/core/include/ZLibrary.h b/zlibrary/core/include/ZLibrary.h index d0090de..611a1ec 100644 --- a/zlibrary/core/include/ZLibrary.h +++ b/zlibrary/core/include/ZLibrary.h @@ -37,8 +37,8 @@ public: static std::string Country(); static const std::string BaseDirectory; - static const std::string &ZLibraryDirectory(); + static const std::string &ZLibraryDirectory(); static const std::string &ImageDirectory(); static const std::string &ApplicationName(); static const std::string &ApplicationImageDirectory(); diff --git a/zlibrary/core/src/library/ZLibrary.cpp b/zlibrary/core/src/library/ZLibrary.cpp index e2456ff..4b29d71 100644 --- a/zlibrary/core/src/library/ZLibrary.cpp +++ b/zlibrary/core/src/library/ZLibrary.cpp @@ -73,7 +73,7 @@ void ZLibrary::parseArguments(int &argc, char **&argv) { argc -= 2; argv += 2; } - ourZLibraryDirectory = BaseDirectory + FileNameDelimiter + "zlibrary"; + ourZLibraryDirectory = std::string(ZLBASEDIR); } void ZLibrary::shutdown() { |