Skip to content

Commit c404491

Browse files
committed
Trying to improve env var requirements.
1 parent b2c2779 commit c404491

File tree

3 files changed

+36
-8
lines changed

3 files changed

+36
-8
lines changed

source/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
7979
# Default definitions
8080
#
8181

82-
add_definitions(
83-
-DCONFIGURATION_INSTALL_PATH=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_DATA}/configurations/global.json\"
84-
-DSERIAL_LIBRARY_INSTALL_PATH=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}\"
85-
-DLOADER_LIBRARY_INSTALL_PATH=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}\"
86-
-DDETOUR_LIBRARY_INSTALL_PATH=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}\"
87-
-DPORT_LIBRARY_INSTALL_PATH=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}\"
82+
set(DEFAULT_COMPILE_DEFINITIONS
83+
${DEFAULT_COMPILE_DEFINITIONS}
84+
CONFIGURATION_INSTALL_PATH="${CMAKE_INSTALL_PREFIX}/${INSTALL_DATA}/configurations/global.json"
85+
SERIAL_LIBRARY_INSTALL_PATH="${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}"
86+
LOADER_LIBRARY_INSTALL_PATH="${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}"
87+
DETOUR_LIBRARY_INSTALL_PATH="${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}"
88+
PORT_LIBRARY_INSTALL_PATH="${CMAKE_INSTALL_PREFIX}/${INSTALL_SHARED}"
8889
)
8990

9091
#

source/ports/node_port/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,4 @@ test_environment_variables(${node_port_test_exec}
266266
${TESTS_ENVIRONMENT_VARIABLES_RS}
267267
${TESTS_ENVIRONMENT_VARIABLES_OPENSSL}
268268
"METACALL_INSTALL_PATH=${PROJECT_OUTPUT_DIR}"
269-
${TESTS_SANITIZER_PRELOAD_ENVIRONMENT_VARIABLES}
270269
)

source/ports/py_port/CMakeLists.txt

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,33 @@ test_environment_variables(${py_port_test_exec}
106106
${TESTS_ENVIRONMENT_VARIABLES}
107107
${TESTS_ENVIRONMENT_VARIABLES_RS}
108108
"METACALL_INSTALL_PATH=${PROJECT_OUTPUT_DIR}"
109-
${TESTS_SANITIZER_PRELOAD_ENVIRONMENT_VARIABLES}
109+
)
110+
111+
#
112+
# Define test (Python standalone)
113+
#
114+
115+
set(py_port_test_exec_alone "${py_port_test}_executable_standalone")
116+
117+
message(STATUS "Test ${py_port_test_exec_alone}")
118+
119+
# Add test (Python standalone)
120+
add_test(NAME ${py_port_test_exec_alone}
121+
COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/test.py"
122+
)
123+
124+
#
125+
# Define test labels
126+
#
127+
128+
set_property(TEST ${py_port_test_exec_alone}
129+
PROPERTY LABELS ${py_port_test_exec_alone}
130+
)
131+
132+
include(TestEnvironmentVariables)
133+
134+
test_environment_variables(${py_port_test_exec_alone}
135+
""
136+
"LOADER_SCRIPT_PATH=${LOADER_SCRIPT_PATH}"
137+
"METACALL_INSTALL_PATH=${PROJECT_OUTPUT_DIR}"
110138
)

0 commit comments

Comments
 (0)