Skip to content

Commit 49a8ecf

Browse files
committed
fixed CMakeLists on linux
1 parent ffeb39e commit 49a8ecf

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

linux/CMakeLists.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.10)
22

3-
include("${CMAKE_CURRENT_SOURCE_DIR}/../cxx/quickjs.cmake")
4-
target_compile_options(quickjs PRIVATE "-fPIC")
53

64
set(PROJECT_NAME "flutter_js")
75
project(${PROJECT_NAME} LANGUAGES CXX C)
@@ -11,15 +9,9 @@ set(PLUGIN_NAME "${PROJECT_NAME}_plugin")
119
set(CMAKE_C_COMPILER "gcc")
1210
set(CMAKE_CXX_COMPILER "g++")
1311
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DANDROID_STL=c++_static -DDEBUGGER_SERVER_PORT=${DEBUGGER_SERVER_PORT}")
14-
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=incompatible-pointer-types-discards-qualifiers")
15-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-int-conversion")
16-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable")
17-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
18-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-maybe-uninitialized")
1912

2013
add_library(${PLUGIN_NAME} SHARED
2114
"flutter_js_plugin.cc"
22-
"${CXX_LIB_DIR}/libfastdev_quickjs_runtime.cpp"
2315
)
2416

2517
apply_standard_settings(${PLUGIN_NAME})
@@ -31,7 +23,6 @@ target_include_directories(${PLUGIN_NAME} INTERFACE
3123
"${CMAKE_CURRENT_SOURCE_DIR}/include")
3224

3325
target_link_libraries(${PLUGIN_NAME} PRIVATE flutter)
34-
target_link_libraries(${PLUGIN_NAME} PRIVATE quickjs)
3526
target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK)
3627

3728
# List of absolute paths to libraries that should be bundled with the plugin
@@ -40,8 +31,6 @@ set(flutter_qjs_bundled_libraries
4031
PARENT_SCOPE
4132
)
4233

43-
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/shared/libquickjs_c_bridge_plugin.so")
44-
4534
set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
4635
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
4736
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
@@ -51,4 +40,4 @@ set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
5140
set(QUICKJSC_BRIDGE "libquickjs_c_bridge_plugin.so")
5241
set(QUICKJSC_BRIDGE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/shared/${QUICKJSC_BRIDGE}")
5342
install(CODE "file(REMOVE_RECURSE \"${INSTALL_BUNDLE_LIB_DIR}/${QUICKJSC_BRIDGE}\")" COMPONENT Runtime)
54-
install(FILES "${QUICKJSC_BRIDGE_PATH}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime)
43+
install(FILES "${QUICKJSC_BRIDGE_PATH}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime)

linux/flutter_js_plugin.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ static gchar* get_executable_dir() {
7272
return g_path_get_dirname(exe_path);
7373
}
7474

75-
7675
void flutter_js_plugin_register_with_registrar(FlPluginRegistrar* registrar) {
7776
FlutterJsPlugin* plugin = FLUTTER_JS_PLUGIN(
7877
g_object_new(flutter_js_plugin_get_type(), nullptr));
@@ -87,7 +86,6 @@ void flutter_js_plugin_register_with_registrar(FlPluginRegistrar* registrar) {
8786
g_object_unref);
8887

8988
g_object_unref(plugin);
90-
9189
g_autofree gchar* executable_dir = get_executable_dir();
9290
g_autofree gchar* lib_path =
9391
g_build_filename(executable_dir, "lib", "libquickjs_c_bridge_plugin.so", nullptr);

0 commit comments

Comments
 (0)