fastqr 1.0.10 → 1.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CMakeLists.txt +70 -12
- data/VERSION +1 -1
- data/bindings/nodejs/package.json +1 -1
- data/bindings/nodejs/prebuilt/macos-arm64/bin/fastqr +0 -0
- data/bindings/ruby/lib/fastqr/version.rb +1 -1
- data/bindings/ruby/prebuilt/macos-arm64/bin/fastqr +0 -0
- data/bindings/ruby/prebuilt/macos-arm64.tar.gz +0 -0
- data/bindings/ruby/prebuilt/macos-x86_64/bin/fastqr +0 -0
- data/bindings/ruby/prebuilt/macos-x86_64.tar.gz +0 -0
- data/src/fastqr.cpp +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cecb54f8189d6e136d9543e962a0e3c2852145fc35fd94f3a0a6615ebd95fa60
|
|
4
|
+
data.tar.gz: dbd35fdf0763e4792d96ca1ea5dceaa191e54b468d788ca00164224577cc7715
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c8e8967e977ebc246706b41848ef042b142d69370c136899a7959fa978a4c244c16894e3d22def54583f65fe432365bc758ed522d6b3b85b25519232cffadd67
|
|
7
|
+
data.tar.gz: 640f00a79e52a95f836b2b69e56ab106466ebcafa10c0dfb90096714c61a2abd95d1c3adf131a0f3c8b7f27b55ebf05ca701baa0c93d043a2cf831ae8583365c
|
data/CMakeLists.txt
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
cmake_minimum_required(VERSION 3.15)
|
|
2
|
-
project(fastqr VERSION 1.0.
|
|
2
|
+
project(fastqr VERSION 1.0.11 LANGUAGES CXX C)
|
|
3
3
|
|
|
4
4
|
set(CMAKE_CXX_STANDARD 14)
|
|
5
5
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
@@ -28,12 +28,12 @@ pkg_check_modules(QRENCODE REQUIRED libqrencode)
|
|
|
28
28
|
# Add library directories
|
|
29
29
|
link_directories(${QRENCODE_LIBRARY_DIRS})
|
|
30
30
|
|
|
31
|
-
#
|
|
32
|
-
add_library(
|
|
31
|
+
# Object library for internal use (no linking yet)
|
|
32
|
+
add_library(fastqr_obj OBJECT
|
|
33
33
|
src/fastqr.cpp
|
|
34
34
|
)
|
|
35
35
|
|
|
36
|
-
target_include_directories(
|
|
36
|
+
target_include_directories(fastqr_obj
|
|
37
37
|
PUBLIC
|
|
38
38
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
39
39
|
$<INSTALL_INTERFACE:include>
|
|
@@ -42,6 +42,22 @@ target_include_directories(fastqr
|
|
|
42
42
|
${PNG_INCLUDE_DIRS}
|
|
43
43
|
)
|
|
44
44
|
|
|
45
|
+
target_compile_options(fastqr_obj
|
|
46
|
+
PRIVATE
|
|
47
|
+
${QRENCODE_CFLAGS_OTHER}
|
|
48
|
+
)
|
|
49
|
+
|
|
50
|
+
# Main library (for install and linking by other projects)
|
|
51
|
+
add_library(fastqr
|
|
52
|
+
$<TARGET_OBJECTS:fastqr_obj>
|
|
53
|
+
)
|
|
54
|
+
|
|
55
|
+
target_include_directories(fastqr
|
|
56
|
+
PUBLIC
|
|
57
|
+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
58
|
+
$<INSTALL_INTERFACE:include>
|
|
59
|
+
)
|
|
60
|
+
|
|
45
61
|
target_link_directories(fastqr
|
|
46
62
|
PRIVATE
|
|
47
63
|
${QRENCODE_LIBRARY_DIRS}
|
|
@@ -53,11 +69,6 @@ target_link_libraries(fastqr
|
|
|
53
69
|
PNG::PNG
|
|
54
70
|
)
|
|
55
71
|
|
|
56
|
-
target_compile_options(fastqr
|
|
57
|
-
PRIVATE
|
|
58
|
-
${QRENCODE_CFLAGS_OTHER}
|
|
59
|
-
)
|
|
60
|
-
|
|
61
72
|
# Set library output name
|
|
62
73
|
set_target_properties(fastqr PROPERTIES
|
|
63
74
|
VERSION ${PROJECT_VERSION}
|
|
@@ -70,9 +81,56 @@ add_executable(fastqr-cli
|
|
|
70
81
|
src/cli.cpp
|
|
71
82
|
)
|
|
72
83
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
84
|
+
# For standalone CLI binary, link with object library and static dependencies
|
|
85
|
+
if(NOT BUILD_SHARED_LIBS)
|
|
86
|
+
# Find static versions of libraries
|
|
87
|
+
find_library(PNG_STATIC_LIBRARY
|
|
88
|
+
NAMES libpng.a libpng16.a
|
|
89
|
+
PATHS
|
|
90
|
+
${PNG_LIBRARY_DIRS}
|
|
91
|
+
/usr/local/lib
|
|
92
|
+
/opt/homebrew/lib
|
|
93
|
+
/usr/lib
|
|
94
|
+
NO_DEFAULT_PATH
|
|
95
|
+
)
|
|
96
|
+
|
|
97
|
+
find_library(QRENCODE_STATIC_LIBRARY
|
|
98
|
+
NAMES libqrencode.a
|
|
99
|
+
PATHS
|
|
100
|
+
${QRENCODE_LIBRARY_DIRS}
|
|
101
|
+
/usr/local/lib
|
|
102
|
+
/opt/homebrew/lib
|
|
103
|
+
/usr/lib
|
|
104
|
+
NO_DEFAULT_PATH
|
|
105
|
+
)
|
|
106
|
+
|
|
107
|
+
if(PNG_STATIC_LIBRARY AND QRENCODE_STATIC_LIBRARY)
|
|
108
|
+
message(STATUS "✓ Found static libpng: ${PNG_STATIC_LIBRARY}")
|
|
109
|
+
message(STATUS "✓ Found static libqrencode: ${QRENCODE_STATIC_LIBRARY}")
|
|
110
|
+
|
|
111
|
+
# Link CLI directly with object library + static libs (no dependency propagation)
|
|
112
|
+
target_link_libraries(fastqr-cli
|
|
113
|
+
PRIVATE
|
|
114
|
+
fastqr_obj
|
|
115
|
+
${QRENCODE_STATIC_LIBRARY}
|
|
116
|
+
${PNG_STATIC_LIBRARY}
|
|
117
|
+
z # zlib is needed by libpng
|
|
118
|
+
)
|
|
119
|
+
else()
|
|
120
|
+
message(WARNING "Static libraries not found, falling back to dynamic linking")
|
|
121
|
+
message(WARNING " libpng: ${PNG_STATIC_LIBRARY}")
|
|
122
|
+
message(WARNING " libqrencode: ${QRENCODE_STATIC_LIBRARY}")
|
|
123
|
+
|
|
124
|
+
target_link_libraries(fastqr-cli
|
|
125
|
+
PRIVATE fastqr
|
|
126
|
+
)
|
|
127
|
+
endif()
|
|
128
|
+
else()
|
|
129
|
+
# Shared library build
|
|
130
|
+
target_link_libraries(fastqr-cli
|
|
131
|
+
PRIVATE fastqr
|
|
132
|
+
)
|
|
133
|
+
endif()
|
|
76
134
|
|
|
77
135
|
set_target_properties(fastqr-cli PROPERTIES
|
|
78
136
|
OUTPUT_NAME fastqr
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.
|
|
1
|
+
1.0.11
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
data/src/fastqr.cpp
CHANGED