Optimize samples build process and build 64 bit binaries by default (#90)
* Optimize samples build process * Samples: build 64 bit version by default
This commit is contained in:
@ -7,27 +7,8 @@ set(WASM_DIR ${REPO_ROOT_DIR}/core/iwasm)
|
||||
set(APP_MGR_DIR ${REPO_ROOT_DIR}/core/app-mgr)
|
||||
set(SHARED_DIR ${REPO_ROOT_DIR}/core/shared-lib)
|
||||
|
||||
set (lv_drivers_name lv_drivers)
|
||||
set (lv_name lvgl)
|
||||
set (LV_DRIVERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/linux/${lv_drivers_name})
|
||||
set (LVGL_DIR ${WASM_DIR}/lib/3rdparty/${lv_name})
|
||||
|
||||
if ((NOT EXISTS ${LVGL_DIR}) OR (NOT EXISTS ${LV_DRIVERS_DIR}))
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/download_lvgl_drivers/CMakeLists.txt)
|
||||
|
||||
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
|
||||
RESULT_VARIABLE result
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/download_lvgl_drivers )
|
||||
if(result)
|
||||
message(FATAL_ERROR "CMake step for lvgl drivers failed: ${result}")
|
||||
endif()
|
||||
execute_process(COMMAND ${CMAKE_COMMAND} --build .
|
||||
RESULT_VARIABLE result
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/download_lvgl_drivers )
|
||||
if(result)
|
||||
message(FATAL_ERROR "Build step for lvgl drivers failed: ${result}")
|
||||
endif()
|
||||
endif()
|
||||
set (LV_DRIVERS_DIR ${WASM_DIR}/lib/3rdparty/lv_drivers)
|
||||
set (LVGL_DIR ${WASM_DIR}/lib/3rdparty/lvgl)
|
||||
|
||||
file(GLOB_RECURSE LV_DRIVERS_SOURCES "${LV_DRIVERS_DIR}/*.c" )
|
||||
|
||||
@ -95,10 +76,12 @@ include (${SHARED_DIR}/coap/lib_coap.cmake)
|
||||
set (PROJECT_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/../src/platform/${TARGET_PLATFORM})
|
||||
|
||||
include_directories(${SHARED_DIR}/include)
|
||||
include_directories(${PROJECT_SRC_DIR})
|
||||
|
||||
add_definitions (-DWASM_ENABLE_BASE_LIB)
|
||||
add_definitions (-Dattr_container_malloc=bh_malloc)
|
||||
add_definitions (-Dattr_container_free=bh_free)
|
||||
add_definitions (-DLV_CONF_INCLUDE_SIMPLE)
|
||||
|
||||
add_library (vmlib
|
||||
${WASM_PLATFORM_LIB_SOURCE}
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
# Copyright (C) 2019 Intel Corporation. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
cmake_minimum_required(VERSION 2.8.2)
|
||||
|
||||
project(lvgl_download NONE)
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
ExternalProject_Add(${lv_name}
|
||||
GIT_REPOSITORY https://github.com/littlevgl/lvgl.git
|
||||
GIT_TAG ""
|
||||
BINARY_DIR ""
|
||||
SOURCE_DIR "${LVGL_DIR}"
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND ""
|
||||
INSTALL_COMMAND ""
|
||||
TEST_COMMAND ""
|
||||
)
|
||||
|
||||
ExternalProject_Add(${lv_drivers_name}
|
||||
GIT_REPOSITORY https://github.com/littlevgl/lv_drivers.git
|
||||
GIT_TAG ""
|
||||
BINARY_DIR ""
|
||||
SOURCE_DIR "${LV_DRIVERS_DIR}"
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND ""
|
||||
INSTALL_COMMAND ""
|
||||
TEST_COMMAND ""
|
||||
)
|
||||
Reference in New Issue
Block a user