fix cmake build

This commit is contained in:
ekibun
2021-01-21 19:50:16 -08:00
parent 2d7156ffb2
commit 9bbb68441f
13 changed files with 25 additions and 73 deletions

View File

@@ -4,4 +4,5 @@ project(ffiquickjs LANGUAGES CXX)
include("${CMAKE_CURRENT_SOURCE_DIR}/../cxx/quickjs.cmake")
add_library(ffiquickjs SHARED ${CXX_LIB_DIR}/ffi.cpp)
target_compile_features(ffiquickjs PUBLIC cxx_std_17)
target_link_libraries(ffiquickjs PRIVATE quickjs)

View File

@@ -43,10 +43,11 @@ Future testEvaluate(qjs) async {
}
void main() async {
test('make.windows', () async {
test('make', () async {
final utf8Encoding = Encoding.getByName('utf-8');
final cmakePath =
"C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe";
final cmakePath = Platform.isWindows
? "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe"
: "cmake";
final buildDir = "./build";
var result = Process.runSync(
cmakePath,
@@ -69,17 +70,7 @@ void main() async {
stdout.write(result.stdout);
stderr.write(result.stderr);
expect(result.exitCode, 0);
}, testOn: 'windows');
test('make.macos', () async {
var result = Process.runSync(
"sh",
['./make.sh'],
workingDirectory: 'macos',
);
stdout.write(result.stdout);
stderr.write(result.stderr);
expect(result.exitCode, 0);
}, testOn: 'mac-os');
});
test('module', () async {
final qjs = FlutterQjs(
moduleHandler: (name) {

View File

@@ -1,11 +0,0 @@
###
# @Description:
# @Author: ekibun
# @Date: 2020-09-24 00:50:13
# @LastEditors: ekibun
# @LastEditTime: 2020-09-24 00:51:43
###
mkdir build
cd build
cmake .. -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
cmake --build . --config Debug