blob: 5295ebf1a6c66e47325e79ebc6efe5600b666f90 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
--- CMakeLists.txt.orig 2025-06-08 19:16:44 UTC
+++ CMakeLists.txt
@@ -43,94 +43,10 @@ set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
-set(cjson_cmake_args
- -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
- -DBUILD_SHARED_AND_STATIC_LIBS=On
- -DBUILD_SHARED_LIBS=Off
- -DENABLE_CJSON_TEST=Off
- -DENABLE_CJSON_UTILS=On
- -DENABLE_TARGET_EXPORT=On
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
- -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
- -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-)
-if(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
- list(APPEND cjson_cmake_args -DWIN32=ON)
-endif()
+# cJSON and cJSONUtils installed from devel/libcjso
-ExternalProject_Add(cjson
- GIT_REPOSITORY "https://github.com/DaveGamble/cJSON"
- GIT_TAG "v1.7.18"
- PREFIX "${EXTERNAL_DIR}/cJSON"
- BUILD_IN_SOURCE 1
- TEST_COMMAND ""
- INSTALL_COMMAND ""
- CMAKE_ARGS ${cjson_cmake_args}
-)
-ExternalProject_Get_Property(cjson source_dir)
-ExternalProject_Get_Property(cjson binary_dir)
-ExternalProject_Get_Property(cjson download_dir)
-set(CJSON_SOURCE_DIR "${source_dir}")
-set(CJSON_BINARY_DIR "${binary_dir}")
-set(CJSON_DOWNLOAD_DIR "${download_dir}")
-if (CMAKE_C_COMPILER_ID STREQUAL "MSVC")
- set(CJSON_STATIC_NAME "cjson.lib")
-else()
- set(CJSON_STATIC_NAME "libcjson.a")
-endif()
-# Full path to the expected built static lib
-set(CJSON_STATIC_LIB "${CJSON_BINARY_DIR}/${CJSON_STATIC_NAME}")
+# libuv installed from devel/libuv
-set(LIBUV_TAG v1.51.0)
-set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
-
-set(libuv_cmake_args
- -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
- -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
- -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DLIBUV_BUILD_TESTS=OFF
- -DLIBUV_BUILD_EXAMPLES=OFF
- -DLIBUV_INSTALL=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-)
-# Append UV_DISABLE_CLOCK_GETTIME only for Windows
-if(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
- list(APPEND libuv_cmake_args -DWIN32=ON)
-endif()
-
-ExternalProject_Add(libuv_ep
- GIT_REPOSITORY "https://github.com/libuv/libuv.git"
- GIT_TAG "${LIBUV_TAG}"
- PREFIX "${EXTERNAL_DIR}/libuv"
- CMAKE_ARGS ${libuv_cmake_args}
- INSTALL_COMMAND ""
- TEST_COMMAND ""
-)
-ExternalProject_Get_Property(libuv_ep source_dir)
-ExternalProject_Get_Property(libuv_ep binary_dir)
-set(LIBUV_SOURCE_DIR "${source_dir}")
-set(LIBUV_BINARY_DIR "${binary_dir}")
-if (CMAKE_C_COMPILER_ID STREQUAL "MSVC")
- set(LIBUV_STATIC_NAME "uv.lib")
-else()
- set(LIBUV_STATIC_NAME "libuv.a")
-endif()
-# Full path to the expected built static lib
-set(LIBUV_STATIC_LIB "${LIBUV_BINARY_DIR}/${LIBUV_STATIC_NAME}")
-
# beectl
set(BEECTL_SRCS
src/beectl.c
@@ -189,8 +105,6 @@ set_property(TARGET beectl PROPERTY C_STANDARD 11) # C
endif()
set_property(TARGET beectl PROPERTY C_STANDARD 11) # C11
-add_dependencies(beectl cjson)
-add_dependencies(beectl libuv_ep)
# The following would be better approach than including cJSON files in our
# source list. But the build fails when cross-compiling, since
@@ -233,14 +147,14 @@ set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFI
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFIX}/bin/beectl")
-set(BEECTL_CHROME_MANIFEST_DIR "etc/opt/chrome/native-messaging-hosts")
+set(BEECTL_CHROME_MANIFEST_DIR "etc/chrome/native-messaging-hosts")
set(BEECTL_CHROMIUM_MANIFEST_DIR "etc/chromium/native-messaging-hosts")
if(uppercase_CMAKE_SYSTEM_NAME MATCHES LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64$")
# Fedora 36 amd64 may have a separate /usr/lib64 dir different from /usr/lib.
set(BEECTL_FIREFOX_MANIFEST_DIR "usr/lib64/mozilla/native-messaging-hosts")
else()
- set(BEECTL_FIREFOX_MANIFEST_DIR "usr/lib/mozilla/native-messaging-hosts")
+ set(BEECTL_FIREFOX_MANIFEST_DIR "lib/mozilla/native-messaging-hosts")
endif()
# RPM package properties
@@ -416,7 +330,7 @@ else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
COMPONENT config)
else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
# Install host app
- install(TARGETS beectl RUNTIME DESTINATION usr/local/bin COMPONENT applications)
+ install(TARGETS beectl RUNTIME DESTINATION bin COMPONENT applications)
configure_file(
chrome-com.ruslan_osmanov.bee.json.in
|
