Skip to content

Commit b6a5766

Browse files
committed
Use namespaced targets in node-addon-examples
1 parent 275efcf commit b6a5766

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
cmake_minimum_required(VERSION 3.15...3.31)
2+
project(node-addon-examples)
3+
4+
file(GLOB_RECURSE SUBDIR_CMAKE_LISTS
5+
"${CMAKE_CURRENT_SOURCE_DIR}/examples/*/CMakeLists.txt"
6+
"${CMAKE_CURRENT_SOURCE_DIR}/tests/*/CMakeLists.txt"
7+
)
8+
9+
foreach(SUBDIR_CMAKE ${SUBDIR_CMAKE_LISTS})
10+
get_filename_component(SUBDIR_PATH ${SUBDIR_CMAKE} DIRECTORY)
11+
add_subdirectory(${SUBDIR_PATH} ${SUBDIR_PATH}/build)
12+
endforeach()

packages/node-addon-examples/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},
2222
"scripts": {
2323
"copy-examples": "tsx scripts/copy-examples.mts",
24-
"gyp-to-cmake": "gyp-to-cmake --weak-node-api .",
25-
"build": "tsx scripts/build-examples.mts",
24+
"gyp-to-cmake": "gyp-to-cmake --namespaced-targets --weak-node-api .",
25+
"build": "cmake-rn --configuration RelWithDebInfo",
2626
"copy-and-build": "node --run copy-examples && node --run gyp-to-cmake && node --run build",
2727
"verify": "tsx scripts/verify-prebuilds.mts",
2828
"test": "node --run copy-and-build && node --run verify",

packages/node-addon-examples/scripts/build-examples.mts

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/node-addon-examples/tests/async/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@ project(async-test)
33

44
find_package(weak-node-api REQUIRED CONFIG)
55

6-
add_library(addon SHARED addon.c)
6+
add_library(async-test-addon SHARED addon.c)
77

88
option(BUILD_APPLE_FRAMEWORK "Wrap addon in an Apple framework" ON)
99

1010
if(APPLE AND BUILD_APPLE_FRAMEWORK)
11-
set_target_properties(addon PROPERTIES
11+
set_target_properties(async-test-addon PROPERTIES
1212
FRAMEWORK TRUE
1313
MACOSX_FRAMEWORK_IDENTIFIER async-test.addon
1414
MACOSX_FRAMEWORK_SHORT_VERSION_STRING 1.0
1515
MACOSX_FRAMEWORK_BUNDLE_VERSION 1.0
1616
XCODE_ATTRIBUTE_SKIP_INSTALL NO
1717
)
1818
else()
19-
set_target_properties(addon PROPERTIES
19+
set_target_properties(async-test-addon PROPERTIES
2020
PREFIX ""
2121
SUFFIX .node
22+
OUTPUT_NAME addon
2223
)
2324
endif()
2425

25-
target_link_libraries(addon PRIVATE weak-node-api)
26-
target_compile_features(addon PRIVATE cxx_std_17)
26+
target_link_libraries(async-test-addon PRIVATE weak-node-api)
27+
target_compile_features(async-test-addon PRIVATE cxx_std_17)

packages/node-addon-examples/tests/buffers/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@ project(buffers-test)
33

44
find_package(weak-node-api REQUIRED CONFIG)
55

6-
add_library(addon SHARED addon.c)
6+
add_library(buffers-test-addon SHARED addon.c)
77

88
option(BUILD_APPLE_FRAMEWORK "Wrap addon in an Apple framework" ON)
99

1010
if(APPLE AND BUILD_APPLE_FRAMEWORK)
11-
set_target_properties(addon PROPERTIES
11+
set_target_properties(buffers-test-addon PROPERTIES
1212
FRAMEWORK TRUE
1313
MACOSX_FRAMEWORK_IDENTIFIER buffers-test.addon
1414
MACOSX_FRAMEWORK_SHORT_VERSION_STRING 1.0
1515
MACOSX_FRAMEWORK_BUNDLE_VERSION 1.0
1616
XCODE_ATTRIBUTE_SKIP_INSTALL NO
1717
)
1818
else()
19-
set_target_properties(addon PROPERTIES
19+
set_target_properties(buffers-test-addon PROPERTIES
2020
PREFIX ""
2121
SUFFIX .node
22+
OUTPUT_NAME addon
2223
)
2324
endif()
2425

25-
target_link_libraries(addon PRIVATE weak-node-api)
26-
target_compile_features(addon PRIVATE cxx_std_17)
26+
target_link_libraries(buffers-test-addon PRIVATE weak-node-api)
27+
target_compile_features(buffers-test-addon PRIVATE cxx_std_17)

0 commit comments

Comments
 (0)