Fixed compilation and version parameters

synacker · Jan 13, 2024 · 8c2638e · 8c2638e
1 parent 6497d84
commit 8c2638e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/daggy-github-actions.yaml b/.github/workflows/daggy-github-actions.yaml
@@ -194,13 +194,13 @@ jobs:
         run: conan config install CI/conan
 
       - name: Conan install
-        run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang13_x64 -of .
+        run: conan install . --build=missing --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 -of .
 
       - name: Conan remove build folders
         run: conan cache clean "*" --source --build --temp --download
 
       - name: Conan build
-        run: conan build . --profile:build=macos-clang13_x64 --profile:host=macos-clang13_x64 --build=missing -of .
+        run: conan build . --profile:build=macos-clang13_x64 --profile:host=macos-clang14_x64 --build=missing -of .
 
       - name: daggy version
         working-directory: build/Release

diff --git a/CI/conan/profiles/macos-clang14_x64 b/CI/conan/profiles/macos-clang14_x64
@@ -0,0 +1,8 @@
+[settings]
+os=Macos
+arch=x86_64
+compiler=apple-clang
+compiler.version=14
+compiler.cppstd=17
+compiler.libcxx=libc++
+build_type=Release
diff --git a/git_version.py b/git_version.py
@@ -56,6 +56,7 @@ def build(self):
     @property
     def branch(self):
         stream = os.popen("git branch --show-current")
+
         return stream.read().strip()
 
     @property

diff --git a/src/Daggy/CConsoleDaggy.cpp b/src/Daggy/CConsoleDaggy.cpp
@@ -42,6 +42,8 @@ CConsoleDaggy::CConsoleDaggy(QObject* parent)
     qApp->setApplicationName("daggy");
     qApp->setApplicationVersion(DAGGY_VERSION_STANDARD);
     qApp->setOrganizationName(DAGGY_VENDOR);
+    qApp->setApplicationVersion(DAGGY_VERSION_FULL);
+    qApp->setOrganizationDomain("daggy.dev");
 
     connect(this, &CConsoleDaggy::interrupt, this, &CConsoleDaggy::stop, Qt::QueuedConnection);
     connect(qApp, &QCoreApplication::aboutToQuit, this, &CConsoleDaggy::fixPcaps);

diff --git a/src/DaggyCore/tests/local/CMakeLists.txt b/src/DaggyCore/tests/local/CMakeLists.txt
@@ -17,7 +17,6 @@ set(SOURCES
 qt6_add_executable(${TARGET} ${SOURCES})
 include(rpath_bin)
 add_test(NAME ${TARGET} COMMAND ${TARGET} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-message("!!!!!!!!!!!!!!!!!111111111111111 PATH $ENV{PATH}:${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
 set_tests_properties(${TARGET} PROPERTIES ENVIRONMENT "PATH=$ENV{PATH}:${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
 
 target_link_libraries(${TARGET} PRIVATE DaggyCore Qt6::Test)

diff --git a/src/cmake/version.cmake b/src/cmake/version.cmake
@@ -63,7 +63,7 @@ macro(SET_GIT_VERSION)
         string(REGEX REPLACE "^v" "" VERSION ${VERSION_TAG})
         set(VERSION ${VERSION}.${VERSION_BUILD})
         set(VERSION_FULL ${VERSION}-${VERSION_BRANCH})
-        if (VERSION_BRANCH STREQUAL ${VERSION_BRANCH} OR VERSION_BRANCH MATCHES "release/.*")
+        if (VERSION_BRANCH STREQUAL ${GIT_DEFAULT_BRANCH} OR VERSION_BRANCH MATCHES "release/.*")
             set(VERSION_STANDARD ${VERSION})
         else()
             set(VERSION_STANDARD ${VERSION_FULL})