f1x1t/myxlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Поддержка обновлённой CMLib

Browse Source
This commit is contained in:
Andrei Astafev
2020-04-13 21:12:16 +03:00
parent f8df5d0ba1
commit f63c6b8302
11 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/myx/base/CMakeLists.txt
View File

@ -13,7 +13,7 @@ set(TRGT_headers
${CMAKE_CURRENT_SOURCE_DIR}/enum_bitmask_operations.hpp)
# cmake-format: on
add_common_library(TARGET ${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources} ${TRGT_headers})
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources} ${TRGT_headers})
common_target_properties(${TRGT})
# Создание цели для проверки утилитой clang-tidy

2
src/myx/filesystem/CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(TRGT_headers
${CMAKE_CURRENT_SOURCE_DIR}/paths_mt.hpp)
# cmake-format: on
add_common_library(TARGET ${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
common_target_properties(${TRGT})
# Создание цели для проверки утилитой clang-tidy

2
src/myx/filesystem/paths.cpp
View File

@ -218,7 +218,7 @@ QString Paths::findConfigFile( const QString& defaultConfigFile )
} // Paths::findConfigFile
QDir Paths::binaryDirectory() const
QDir Paths::executableFileDirectory() const
{
return( m_currentExecutable.m_canonicalFilePath.dir() );
}

2
src/myx/filesystem/paths.hpp
View File

@ -131,7 +131,7 @@ public:
/**
* @brief Полный путь к каталогу с исполняемым файлом
*/
QDir binaryDirectory() const;
QDir executableFileDirectory() const;
/**
* @brief Полный путь к пользовательскому каталогу с файлами настройки

2
src/myx/math/CMakeLists.txt
View File

@ -24,7 +24,7 @@ set(TRGT_headers
${CMAKE_CURRENT_SOURCE_DIR}/units.hpp)
# cmake-format: on
add_common_library(TARGET ${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
common_target_properties(${TRGT})
# Создание цели для проверки утилитой clang-tidy

2
src/myx/qt/CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(TRGT_headers
${CMAKE_CURRENT_SOURCE_DIR}/translators.hpp)
# cmake-format: on
add_common_library(TARGET ${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
common_target_properties(${TRGT})
# Создание цели для проверки утилитой clang-tidy

2
src/myx/redis/CMakeLists.txt
View File

@ -18,7 +18,7 @@ set(TRGT_headers
${CMAKE_CURRENT_SOURCE_DIR}/request.hpp)
# cmake-format: on
add_common_library(TARGET ${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
add_common_library(${TRGT} OUTPUT_NAME myx-${TRGT} SOURCES ${TRGT_sources})
common_target_properties(${TRGT})
# Создание цели для проверки утилитой clang-tidy