Skip to content

Commit bcb469b

Browse files
committed
FIX | cmake
1 parent a9707cb commit bcb469b

5 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/conan_build_and_test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,15 @@ jobs:
7676
uses: actions/cache@v4
7777
with:
7878
path: /home/runner/.conan2
79+
save-always: true
7980
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.library_type }}
8081

8182
- name: Cache Conan Dependencies (Windows Latest)
8283
if: ${{ matrix.os == 'windows-latest' }}
8384
id: cache-conan-windows
8485
uses: actions/cache@v4
8586
with:
87+
save-always: true
8688
path: C:\Users\runneradmin\.conan2
8789
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.library_type }}
8890

@@ -186,6 +188,7 @@ jobs:
186188
with:
187189
path: C:\Users\runneradmin\.conan2
188190
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.build_type }}-${{ matrix.library_type }}
191+
save-always: true
189192

190193
- if: ${{ (matrix.os == 'ubuntu-latest' && steps.cache-conan-ubuntu.outputs.cache-hit != 'true') || (matrix.os == 'windows-latest' && steps.cache-conan-windows.outputs.cache-hit != 'true') }}
191194
name: Create default Conan profile

CMakeLists.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cmake_minimum_required(VERSION 3.28.2) # CXX Modules Support
22
cmake_minimum_required(VERSION 3.10)
3-
project(manapihttp LANGUAGES CXX VERSION 1.0.5 DESCRIPTION "Fast HTTP Server/Client Library for easy develop API-Services and Web Applications")
3+
project(manapihttp LANGUAGES CXX VERSION 1.1.0 DESCRIPTION "Fast HTTP Server/Client Library for easy develop API-Services and Web Applications")
44

55
set(CMAKE_CXX_STANDARD 23)
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -1001,14 +1001,12 @@ find_package(Threads)
10011001
target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
10021002

10031003
if (MANAPIHTTP_BUILD_METHOD STREQUAL "conan")
1004-
get_target_property(LIBUV_INCLUDE_DIRECTORIES uv INTERFACE_INCLUDE_DIRECTORIES)
1005-
1006-
message(STATUS ${libuv_CONAN_INCLUDE_DIRS})
1004+
message(STATUS ${libuv_INCLUDE_DIR})
10071005
if (NOT EXISTS "${CMAKE_BINARY_DIR}/include/ext/uv.h")
1008-
file(COPY ${libuv_CONAN_INCLUDE_DIRS}/uv DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
1009-
file(COPY ${libuv_CONAN_INCLUDE_DIRS}/uv.h DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
1006+
file(COPY ${libuv_INCLUDE_DIR}/uv DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
1007+
file(COPY ${libuv_INCLUDE_DIR}/uv.h DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
10101008
if (NOT EXISTS "${CMAKE_BINARY_DIR}/include/ext/uv.h")
1011-
message( FATAL_ERROR "Failed to copy uv.h from ${libuv_CONAN_INCLUDE_DIRS}" )
1009+
message( FATAL_ERROR "Failed to copy uv.h from ${libuv_INCLUDE_DIR}" )
10121010
endif()
10131011
endif()
10141012

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class ManapiHttpConan(ConanFile):
1212
name = "manapihttp"
1313
description = "Fast http server/client"
14-
version = "1.0.5"
14+
version = "1.1.0"
1515

1616
settings = "os", "compiler", "build_type", "arch"
1717

package/DEBIAN/changelog

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
manapihttp (1.0.5dfsg-1) unstable; urgency=high
1+
manapihttp (1.1.0dfsg-1) unstable; urgency=high
22
* Bug fixes
3-
-- Timur Zajnullin <me@timurtuty.ru> Wed, 22 Dec 2025 10:00:00 +0000
3+
* Disable some logs
4+
-- Timur Zajnullin <me@timurtuty.ru> Wed, 15 Mar 2025 10:00:00 +0000

package/DEBIAN/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: manapihttp
22
Provides: manapihttp
3-
Version: 1.0.5
3+
Version: 1.1.0
44
Section: libs
55
Installed-Size:
66
Maintainer: Xiadnoring <me@timurtuty.ru>

0 commit comments

Comments
 (0)