Fix loading of ZLibrary resources

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

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 )

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 )

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();

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() {