From a35bec473b0179880156c927c73f27aa0a9259d9 Mon Sep 17 00:00:00 2001 From: viferga Date: Wed, 27 Nov 2019 07:59:54 -0900 Subject: [PATCH] Remove runtime output directory, testing rpath in guix. --- source/loaders/jsm_loader/CMakeLists.txt | 1 + source/ports/node_port/CMakeLists.txt | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/loaders/jsm_loader/CMakeLists.txt b/source/loaders/jsm_loader/CMakeLists.txt index 5225d16e5..307267b51 100644 --- a/source/loaders/jsm_loader/CMakeLists.txt +++ b/source/loaders/jsm_loader/CMakeLists.txt @@ -82,6 +82,7 @@ distributable_generate(${target} ${jsm_loader_unity_build} # Build library add_library(${target} MODULE + ${jsm_loader_unity_build} ${sources} ${headers} ) diff --git a/source/ports/node_port/CMakeLists.txt b/source/ports/node_port/CMakeLists.txt index 4a27652d2..2c8d9054d 100644 --- a/source/ports/node_port/CMakeLists.txt +++ b/source/ports/node_port/CMakeLists.txt @@ -127,11 +127,6 @@ set_target_properties(${target} # Set valid format for NodeJS addon PREFIX "" SUFFIX ".node" - - # Set runtime output directory (mimic node-gyp) - ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build" - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build" ) #