mirror of
https://github.com/weechat/weechat.git
synced 2026-06-12 14:14:48 +02:00
Emil Velikov
a413d16038
Move the requirement checks within the respective plugin cmakefile. Use REQUIRED instead of the manual FOUND check and error handling. Note: the tcl check was only moved, since using REQUIRED explodes in CI. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5d15a3548..0786637b9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -19,7 +19,7 @@
|
|
# along with WeeChat. If not, see <https://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
-cmake_minimum_required(VERSION 3.18)
|
|
+cmake_minimum_required(VERSION 3.16)
|
|
|
|
project(weechat C)
|
|
|
|
diff --git a/debian-devel/rules b/debian-devel/rules
|
|
index 086056f76..559ccfffb 100755
|
|
--- a/debian-devel/rules
|
|
+++ b/debian-devel/rules
|
|
@@ -8,6 +8,7 @@ override_dh_auto_configure:
|
|
dh_auto_configure --buildsystem=cmake -- \
|
|
-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
|
|
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
|
|
+ -DENABLE_CJSON:BOOL=OFF \
|
|
-DENABLE_DOC:BOOL=ON \
|
|
-DENABLE_MAN:BOOL=ON \
|
|
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
|
|
diff --git a/debian-stable/rules b/debian-stable/rules
|
|
index 086056f76..559ccfffb 100755
|
|
--- a/debian-stable/rules
|
|
+++ b/debian-stable/rules
|
|
@@ -8,6 +8,7 @@ override_dh_auto_configure:
|
|
dh_auto_configure --buildsystem=cmake -- \
|
|
-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
|
|
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
|
|
+ -DENABLE_CJSON:BOOL=OFF \
|
|
-DENABLE_DOC:BOOL=ON \
|
|
-DENABLE_MAN:BOOL=ON \
|
|
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
|
|
diff --git a/src/plugins/ruby/CMakeLists.txt b/src/plugins/ruby/CMakeLists.txt
|
|
index fe72c7c56..1fb293512 100644
|
|
--- a/src/plugins/ruby/CMakeLists.txt
|
|
+++ b/src/plugins/ruby/CMakeLists.txt
|
|
@@ -31,7 +31,7 @@ set_target_properties(ruby PROPERTIES PREFIX "")
|
|
# caused by Ruby headers (with Ruby ≥ 3.1.0)
|
|
# see: https://github.com/ruby/ruby/pull/7085
|
|
add_definitions(-Wno-unused-parameter)
|
|
-include_directories(${Ruby_INCLUDE_DIRS})
|
|
-target_link_libraries(ruby ${Ruby_LIBRARIES} weechat_plugins_scripts coverage_config)
|
|
+include_directories(${RUBY_INCLUDE_DIRS})
|
|
+target_link_libraries(ruby ${RUBY_LIBRARY} weechat_plugins_scripts coverage_config)
|
|
|
|
install(TARGETS ruby LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")
|