DoneJS/quickjs-done-nextgen
1
0
Fork 0
mirror of https://github.com/DoneJS-Runtime/quickjs-done-nextgen.git synced 2025-01-09 17:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mark required link libraries as PUBLIC (#520)

Browse source 
This way dependent projects only need to add this:

```
link_libraries(qjs)
```

or

```
target_link_libraries(mytarget qjs)
```

And CMake will link the resulting target with the libraries that qjs
needs too.
This commit is contained in:
Saúl Ibarra Corretgé 2024-09-10 23:42:31 +02:00 committed by GitHub
parent 6dd2ce308a
commit dc6745a4b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
CMakeLists.txt
View file

@ -169,7 +169,7 @@ list(APPEND qjs_defines _GNU_SOURCE)
if(WIN32) if(WIN32)
list(APPEND qjs_defines WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0602) list(APPEND qjs_defines WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0602)
endif() endif()
list(APPEND qjs_libs qjs ${CMAKE_DL_LIBS}) list(APPEND qjs_libs ${CMAKE_DL_LIBS})
find_package(Threads) find_package(Threads)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI") if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI")
list(APPEND qjs_libs ${CMAKE_THREAD_LIBS_INIT}) list(APPEND qjs_libs ${CMAKE_THREAD_LIBS_INIT})
@ -184,6 +184,7 @@ target_include_directories(qjs PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
) )
target_link_libraries(qjs PUBLIC ${qjs_libs})
if(EMSCRIPTEN) if(EMSCRIPTEN)
add_executable(qjs_wasm ${qjs_sources}) add_executable(qjs_wasm ${qjs_sources})
@ -212,7 +213,7 @@ add_executable(qjsc
) )
add_qjs_libc_if_needed(qjsc) add_qjs_libc_if_needed(qjsc)
target_compile_definitions(qjsc PRIVATE ${qjs_defines}) target_compile_definitions(qjsc PRIVATE ${qjs_defines})
target_link_libraries(qjsc ${qjs_libs}) target_link_libraries(qjsc qjs)
# QuickJS CLI # QuickJS CLI
@ -227,7 +228,7 @@ set_target_properties(qjs_exe PROPERTIES
OUTPUT_NAME "qjs" OUTPUT_NAME "qjs"
) )
target_compile_definitions(qjs_exe PRIVATE ${qjs_defines}) target_compile_definitions(qjs_exe PRIVATE ${qjs_defines})
target_link_libraries(qjs_exe ${qjs_libs}) target_link_libraries(qjs_exe qjs)
if(BUILD_STATIC_QJS_EXE OR MINGW) if(BUILD_STATIC_QJS_EXE OR MINGW)
target_link_options(qjs_exe PRIVATE -static) target_link_options(qjs_exe PRIVATE -static)
if(MINGW) if(MINGW)
@ -249,7 +250,7 @@ if(NOT WIN32 AND NOT EMSCRIPTEN)
) )
add_qjs_libc_if_needed(run-test262) add_qjs_libc_if_needed(run-test262)
target_compile_definitions(run-test262 PRIVATE ${qjs_defines}) target_compile_definitions(run-test262 PRIVATE ${qjs_defines})
target_link_libraries(run-test262 ${qjs_libs}) target_link_libraries(run-test262 qjs)
endif() endif()
# Unicode generator # Unicode generator
@ -268,7 +269,7 @@ add_executable(function_source
add_qjs_libc_if_needed(function_source) add_qjs_libc_if_needed(function_source)
target_include_directories(function_source PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(function_source PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(function_source PRIVATE ${qjs_defines}) target_compile_definitions(function_source PRIVATE ${qjs_defines})
target_link_libraries(function_source ${qjs_libs}) target_link_libraries(function_source qjs)
# Examples # Examples
# #
@ -280,7 +281,7 @@ if(BUILD_EXAMPLES)
add_qjs_libc_if_needed(hello) add_qjs_libc_if_needed(hello)
target_include_directories(hello PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(hello PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(hello PRIVATE ${qjs_defines}) target_compile_definitions(hello PRIVATE ${qjs_defines})
target_link_libraries(hello ${qjs_libs}) target_link_libraries(hello qjs)
add_executable(hello_module add_executable(hello_module
gen/hello_module.c gen/hello_module.c
@ -288,7 +289,7 @@ if(BUILD_EXAMPLES)
add_qjs_libc_if_needed(hello_module) add_qjs_libc_if_needed(hello_module)
target_include_directories(hello_module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(hello_module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(hello_module PRIVATE ${qjs_defines}) target_compile_definitions(hello_module PRIVATE ${qjs_defines})
target_link_libraries(hello_module ${qjs_libs}) target_link_libraries(hello_module qjs)
add_library(fib MODULE examples/fib.c) add_library(fib MODULE examples/fib.c)
set_target_properties(fib PROPERTIES set_target_properties(fib PROPERTIES
@ -297,9 +298,8 @@ if(BUILD_EXAMPLES)
) )
target_compile_definitions(fib PRIVATE JS_SHARED_LIBRARY) target_compile_definitions(fib PRIVATE JS_SHARED_LIBRARY)
if(WIN32) if(WIN32)
target_link_libraries(fib ${qjs_libs}) target_link_libraries(fib qjs)
endif() elseif(APPLE)
if(APPLE)
target_link_options(fib PRIVATE -undefined dynamic_lookup) target_link_options(fib PRIVATE -undefined dynamic_lookup)
endif() endif()
@ -310,11 +310,10 @@ if(BUILD_EXAMPLES)
) )
target_compile_definitions(point PRIVATE JS_SHARED_LIBRARY) target_compile_definitions(point PRIVATE JS_SHARED_LIBRARY)
if(WIN32) if(WIN32)
target_link_libraries(point ${qjs_libs}) target_link_libraries(point qjs)
endif() elseif(APPLE)
if(APPLE)
target_link_options(point PRIVATE -undefined dynamic_lookup) target_link_options(point PRIVATE -undefined dynamic_lookup)
endif() endif()
add_executable(test_fib add_executable(test_fib
examples/fib.c examples/fib.c
@ -323,7 +322,7 @@ if(BUILD_EXAMPLES)
add_qjs_libc_if_needed(test_fib) add_qjs_libc_if_needed(test_fib)
target_include_directories(test_fib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(test_fib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(test_fib PRIVATE ${qjs_defines}) target_compile_definitions(test_fib PRIVATE ${qjs_defines})
target_link_libraries(test_fib ${qjs_libs}) target_link_libraries(test_fib qjs)
endif() endif()
add_executable(test_conv add_executable(test_conv