Remove runtime output directory, testing rpath in guix.

viferga · viferga · commit a35bec473b01 · 2019-11-27T07:59:54.000-09:00
diff --git 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
@@ -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"
 )
 
 #

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ distributable_generate(${target} ${jsm_loader_unity_build}`
`82`	`82`
`83`	`83`	`# Build library`
`84`	`84`	`add_library(${target} MODULE`
	`85`	`+ ${jsm_loader_unity_build}`
`85`	`86`	`${sources}`
`86`	`87`	`${headers}`
`87`	`88`	`)`
Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,6 @@ set_target_properties(${target}`
`127`	`127`
`128`	`128`	`# Set valid format for NodeJS addon`
`129`	`129`	`PREFIX "" SUFFIX ".node"`
`130`		`-`
`131`		`- # Set runtime output directory (mimic node-gyp)`
`132`		`- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build"`
`133`		`- LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build"`
`134`		`- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build"`
`135`	`130`	`)`
`136`	`131`
`137`	`132`	`#`