archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixed nuttx build with fdlibm

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Tamas Czene tczene.u-szeged@partner.samsung.com
This commit is contained in:
Tamas Czene 2015-05-22 09:21:48 +02:00 committed by Peter Gal
parent d144cbfe90
commit 677a0a45d0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -323,7 +323,7 @@ project (Jerry CXX C ASM)
set(CORE_TARGET_NAME ${CORE_TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}}) set(CORE_TARGET_NAME ${CORE_TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}})
endforeach() endforeach()
set(FDLIBM_TARGET_NAME ${CORE_TARGET_NAME}.jerry-fdlibm.${SUFFIX_THIRD_PARTY_LIB}) set(FDLIBM_TARGET_NAME ${CORE_TARGET_NAME}.jerry-fdlibm${SUFFIX_THIRD_PARTY_LIB})
set(CORE_TARGET_NAME ${CORE_TARGET_NAME}.jerry-core) set(CORE_TARGET_NAME ${CORE_TARGET_NAME}.jerry-core)
set(DEFINES_JERRY ) set(DEFINES_JERRY )
@ -385,13 +385,14 @@ project (Jerry CXX C ASM)
target_include_directories(${MAIN_MODULE_TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE}) target_include_directories(${MAIN_MODULE_TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE})
add_custom_target(${TARGET_NAME} ALL) add_custom_target(${TARGET_NAME} ALL)
add_dependencies(${TARGET_NAME} ${MAIN_MODULE_TARGET_NAME} ${PLUGINS_TARGET_NAME} ${CORE_TARGET_NAME}) add_dependencies(${TARGET_NAME} ${MAIN_MODULE_TARGET_NAME} ${FDLIBM_TARGET_NAME} ${PLUGINS_TARGET_NAME} ${CORE_TARGET_NAME})
add_custom_command(TARGET ${TARGET_NAME} add_custom_command(TARGET ${TARGET_NAME}
POST_BUILD POST_BUILD
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/${TARGET_NAME} COMMAND mkdir -p ${CMAKE_BINARY_DIR}/${TARGET_NAME}
COMMAND echo COMMAND echo
$<TARGET_FILE:${MAIN_MODULE_TARGET_NAME}> $<TARGET_FILE:${MAIN_MODULE_TARGET_NAME}>
$<TARGET_FILE:${FDLIBM_TARGET_NAME}>
$<TARGET_FILE:${PLUGINS_TARGET_NAME}> $<TARGET_FILE:${PLUGINS_TARGET_NAME}>
$<TARGET_FILE:${CORE_TARGET_NAME}> > ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list) $<TARGET_FILE:${CORE_TARGET_NAME}> > ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list)
@ -423,7 +424,7 @@ project (Jerry CXX C ASM)
set(TARGET_NAME unit_${TARGET_NAME}) set(TARGET_NAME unit_${TARGET_NAME})
set(CORE_TARGET_NAME unittests.jerry-core) set(CORE_TARGET_NAME unittests.jerry-core)
set(FDLIBM_TARGET_NAME unittests.jerry-fdlibm.${SUFFIX_THIRD_PARTY_LIB}) set(FDLIBM_TARGET_NAME unittests.jerry-fdlibm${SUFFIX_THIRD_PARTY_LIB})
add_executable(${TARGET_NAME} ${SOURCE_UNIT_TEST_MAIN}) add_executable(${TARGET_NAME} ${SOURCE_UNIT_TEST_MAIN})
set_property(TARGET ${TARGET_NAME} set_property(TARGET ${TARGET_NAME}

8
third-party/fdlibm/CMakeLists.txt vendored
View File

@ -47,13 +47,13 @@ add_custom_target (jerry-fdlibm-all)
set(TARGET_NAME ${TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}}) set(TARGET_NAME ${TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}})
endforeach() endforeach()
add_library(${TARGET_NAME}.jerry-fdlibm.${SUFFIX_THIRD_PARTY_LIB} STATIC ${SOURCE_FDLIBM}) add_library(${TARGET_NAME}.jerry-fdlibm${SUFFIX_THIRD_PARTY_LIB} STATIC ${SOURCE_FDLIBM})
set_property(TARGET ${TARGET_NAME}.jerry-fdlibm.${SUFFIX_THIRD_PARTY_LIB} set_property(TARGET ${TARGET_NAME}.jerry-fdlibm${SUFFIX_THIRD_PARTY_LIB}
PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_FDLIBM}") PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_FDLIBM}")
target_include_directories(${TARGET_NAME}.jerry-fdlibm.${SUFFIX_THIRD_PARTY_LIB} PRIVATE ${INCLUDE_FDLIBM}) target_include_directories(${TARGET_NAME}.jerry-fdlibm${SUFFIX_THIRD_PARTY_LIB} PRIVATE ${INCLUDE_FDLIBM})
if("${BUILD_MODE}" STREQUAL "UNITTESTS") if("${BUILD_MODE}" STREQUAL "UNITTESTS")
target_include_directories(${TARGET_NAME}.jerry-fdlibm.${SUFFIX_THIRD_PARTY_LIB} INTERFACE ${INCLUDE_FDLIBM}) target_include_directories(${TARGET_NAME}.jerry-fdlibm${SUFFIX_THIRD_PARTY_LIB} INTERFACE ${INCLUDE_FDLIBM})
endif() endif()
endfunction() endfunction()