File tree Expand file tree Collapse file tree 2 files changed +30
-9
lines changed Expand file tree Collapse file tree 2 files changed +30
-9
lines changed Original file line number Diff line number Diff line change @@ -3,20 +3,22 @@ $(package)_version=4.1.1
3
3
$(package)_download_path =https://fukuchi.org/works/qrencode/
4
4
$(package)_file_name =$(package ) -$($(package ) _version) .tar.bz2
5
5
$(package)_sha256_hash =e455d9732f8041cf5b9c388e345a641fd15707860f928e94507b1961256a6923
6
+ $(package)_patches =cmake_fixups.patch
6
7
7
8
define $(package)_set_vars
8
- $(package ) _config_opts=--disable-shared --without-tools --without-tests --without-png
9
- $(package ) _config_opts += --disable-gprof --disable-gcov --disable-mudflap
10
- $(package ) _config_opts += --disable-dependency-tracking --enable-option-checking
9
+ $(package ) _config_opts := -DWITH_TOOLS=NO -DWITH_TESTS=NO -DGPROF=OFF -DCOVERAGE=OFF
10
+ $(package ) _config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE -DWITHOUT_PNG=ON
11
+ $(package ) _config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ICONV=TRUE
11
12
$(package ) _cflags += -Wno-int-conversion -Wno-implicit-function-declaration
12
13
endef
13
14
14
15
define $(package)_preprocess_cmds
15
- cp -f $( BASEDIR ) /config.guess $( BASEDIR ) /config.sub use
16
+ patch -p1 < $( $( package ) _patch_dir) /cmake_fixups.patch
16
17
endef
17
18
19
+
18
20
define $(package)_config_cmds
19
- $($(package ) _autoconf)
21
+ $($(package ) _cmake) -S . -B .
20
22
endef
21
23
22
24
define $(package)_build_cmds
26
28
define $(package)_stage_cmds
27
29
$(MAKE ) DESTDIR=$($(package ) _staging_dir) install
28
30
endef
29
-
30
- define $(package)_postprocess_cmds
31
- rm lib/*.la
32
- endef
Original file line number Diff line number Diff line change
1
+ cmake: set minimum version to 3.5
2
+
3
+ Correct some dev warning output.
4
+
5
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
6
+ index 773e037..a558145 100644
7
+ --- a/CMakeLists.txt
8
+ +++ b/CMakeLists.txt
9
+ @@ -1,4 +1,4 @@
10
+ - cmake_minimum_required(VERSION 3.1.0)
11
+ + cmake_minimum_required(VERSION 3.5)
12
+
13
+ project(QRencode VERSION 4.1.1 LANGUAGES C)
14
+
15
+ @@ -20,7 +20,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
16
+ set(CMAKE_THREAD_PREFER_PTHREAD ON)
17
+ find_package(Threads)
18
+ find_package(PNG)
19
+ - find_package(Iconv)
20
+ + find_package(ICONV)
21
+
22
+ if(CMAKE_USE_PTHREADS_INIT)
23
+ add_definitions(-DHAVE_LIBPTHREAD=1)
You can’t perform that action at this time.
0 commit comments