diff --git a/CMakeLists.txt b/CMakeLists.txt index 02fa37163..11c981694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,6 +278,12 @@ project (Jerry CXX C ASM) add_jerry_compile_flags(-Wno-nested-anon-types) endif() + if(DEFINED EXTERNAL_COMPILE_FLAGS) + foreach(FLAG ${EXTERNAL_COMPILE_FLAGS}) + set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} ${FLAG}") + endforeach() + endif() + # Static build if(NOT ("${PLATFORM}" STREQUAL "DARWIN")) set(LINKER_FLAGS_STATIC "-static") @@ -465,6 +471,18 @@ endif() COMMAND echo $ > ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list COMMAND echo $ >> ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list) + if(DEFINED EXTERNAL_BUILD_ENTRY_FILE) + add_library(${TARGET_NAME}-entry STATIC ${EXTERNAL_BUILD_ENTRY_FILE}) + set_property(TARGET ${TARGET_NAME}-entry + PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}") + target_compile_definitions(${TARGET_NAME}-entry PRIVATE ${DEFINES_JERRY}) + target_include_directories(${TARGET_NAME}-entry PRIVATE ${INCLUDE_CORE_INTERFACE}) + target_include_directories(${TARGET_NAME}-entry SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}) + target_include_directories(${TARGET_NAME}-entry SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE}) + target_include_directories(${TARGET_NAME}-entry SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE}) + add_dependencies(${TARGET_NAME} ${TARGET_NAME}-entry) + endif() + if(${USE_JERRY_LIBC}) add_dependencies(${TARGET_NAME} ${LIBC_TARGET_NAME}) add_custom_command(TARGET ${TARGET_NAME} diff --git a/tools/precommit.sh b/tools/precommit.sh index b253786a8..71e438234 100755 --- a/tools/precommit.sh +++ b/tools/precommit.sh @@ -36,7 +36,7 @@ then exit 1 fi -VERA_DIRECTORIES_EXCLUDE_LIST="-path ./third-party -o -path tests" +VERA_DIRECTORIES_EXCLUDE_LIST="-path ./third-party -o -path tests -o -path ./targets" VERA_CONFIGURATION_PATH="./tools/vera++" SOURCES_AND_HEADERS_LIST=`find . -type d \( $VERA_DIRECTORIES_EXCLUDE_LIST \) -prune -or -name "*.c" -or -name "*.cpp" -or -name "*.h"`