Обновление подмодулей

cmake/cmlib

@@ -1 +1 @@
-Subproject commit 3c0fd214b9ad8bd9306aba18b37d7078319654b1
+Subproject commit 3e8511da714b7963cd7197dea83aad306d7c9f7b

examples/filesystem/01_minimal/CMakeLists.txt

@@ -27,8 +27,8 @@ add_pvs_check(${TRGT})
 # Создание цели для автоматического форматирования кода
 add_format_sources(${TRGT} ${TRGT_cpp})
 
-add_dependencies(${TRGT} base)
+add_dependencies(${TRGT} base_static)
-add_dependencies(${TRGT} filesystem)
+add_dependencies(${TRGT} filesystem_static)
 
 target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
@@ -38,9 +38,8 @@ target_link_libraries(${TRGT} Qt5::Core)
 target_link_libraries(${TRGT} Threads::Threads)
 
 # Имя выходного файла для цели
-set_target_properties(
+set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME filesystem-minimal
-  ${TRGT} PROPERTIES OUTPUT_NAME filesystem-minimal RUNTIME_OUTPUT_DIRECTORY
+                                         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-                                                              ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 
 add_sanitizers(${TRGT})
 

examples/qt/01_translators/CMakeLists.txt

@@ -4,7 +4,11 @@ set(TRGT example-qt-translators)
 # Список файлов исходных текстов
 set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp)
 
-qt5_translation(TRGT_qrc OUTPUT_DIR ${CMAKE_SOURCE_DIR}/l10n BASE_NAME ${TRGT} LANGUAGES ru_RU)
+qt5_translation(
+  TRGT_qrc
+  OUTPUT_DIR ${CMAKE_SOURCE_DIR}/l10n
+  BASE_NAME ${TRGT}
+  LANGUAGES ru_RU)
 
 # Путь поиска библиотек внутри проекта
 link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
@@ -29,8 +33,8 @@ add_pvs_check(${TRGT})
 # Создание цели для автоматического форматирования кода
 add_format_sources(${TRGT} ${TRGT_cpp})
 
-add_dependencies(${TRGT} base)
+add_dependencies(${TRGT} base_static)
-add_dependencies(${TRGT} qt)
+add_dependencies(${TRGT} qt_static)
 
 # Qt5
 target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
@@ -40,9 +44,8 @@ target_link_libraries(${TRGT} myx-qt)
 target_link_libraries(${TRGT} Qt5::Core)
 
 # Имя выходного файла для цели
-set_target_properties(
+set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME qt-translators
-  ${TRGT} PROPERTIES OUTPUT_NAME qt-translators RUNTIME_OUTPUT_DIRECTORY
+                                         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-                                                          ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 
 add_sanitizers(${TRGT})
 

src/myx/base/CMakeLists.txt

@@ -37,9 +37,6 @@ target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P
                                                   "${CMAKE_BINARY_DIR}/cmake_install.cmake")
 
-set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME myx-base RUNTIME_OUTPUT_DIRECTORY
-                                                              ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-
 # Правила для установки
 install(TARGETS ${TRGT}_static COMPONENT DEV ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 if(BUILD_SHARED_LIBS)

src/myx/filesystem/CMakeLists.txt

@@ -41,9 +41,6 @@ target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include)
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P
                                                   "${CMAKE_BINARY_DIR}/cmake_install.cmake")
 
-set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME myx-filesystem
-                                         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-
 # Правила для установки
 install(TARGETS ${TRGT}_static COMPONENT DEV ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 if(BUILD_SHARED_LIBS)

src/myx/filesystem/paths.cpp

@@ -15,9 +15,34 @@ Paths::Paths() = default;
 
 Paths::HierarchyType Paths::getHierarchyType()
 {
+	QRegExp binUnityRegexp( "/s*bin/unity$" );
 	QRegExp binRegexp( "/s*bin$" );
 	auto binaryDir = m_currentExecutable.m_canonicalFilePath.canonicalPath();
 
+	if ( binUnityRegexp.indexIn( binaryDir ) >= 0 )
+	{
+		binaryDir.remove( binUnityRegexp );
+
+		QFileInfo etcDirInfo { binaryDir + "/etc" };
+		if ( !etcDirInfo.isDir() || !etcDirInfo.isReadable() ) { return( HierarchyType::kFlat ); }
+
+		QFileInfo constDataDirInfo { binaryDir + "/files/data" };
+		if ( !constDataDirInfo.isDir() || !constDataDirInfo.isReadable() ) { return( HierarchyType::kFlat ); }
+
+		QFileInfo varDataDirInfo { binaryDir + "/files/lib" };
+		if ( !varDataDirInfo.isDir() || !varDataDirInfo.isWritable() ) { return( HierarchyType::kFlat ); }
+
+		QFileInfo logDirInfo { binaryDir + "/files/log" };
+		if ( !logDirInfo.isDir() || !logDirInfo.isWritable() ) { return( HierarchyType::kFlat ); }
+
+		m_systemConfigDirectory    = etcDirInfo.canonicalFilePath();
+		m_systemConstDataDirectory = constDataDirInfo.canonicalFilePath();
+		m_systemVarDataDirectory   = varDataDirInfo.canonicalFilePath();
+		m_systemLogDirectory       = logDirInfo.canonicalFilePath();
+
+		return ( HierarchyType::kDevelopment );
+	}
+
 	if ( binRegexp.indexIn( binaryDir ) == -1 )
 	{
 		return ( HierarchyType::kFlat );

src/myx/math/CMakeLists.txt

@@ -50,9 +50,6 @@ target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include)
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P
                                                   "${CMAKE_BINARY_DIR}/cmake_install.cmake")
 
-set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME myx-math RUNTIME_OUTPUT_DIRECTORY
-                                                              ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-
 # Правила для установки
 install(TARGETS ${TRGT}_static COMPONENT DEV ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 if(BUILD_SHARED_LIBS)

src/myx/redis/CMakeLists.txt

@@ -45,9 +45,6 @@ target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include)
 add_custom_target(${TRGT}-install-headers COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_COMPONENT=DEV -P
                                                   "${CMAKE_BINARY_DIR}/cmake_install.cmake")
 
-set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME qxredis RUNTIME_OUTPUT_DIRECTORY
-                                                             ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-
 # Правила для установки
 install(TARGETS ${TRGT}_static COMPONENT DEV ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 if(BUILD_SHARED_LIBS)