From c95e679958bd0d111bc3331955517fc7151b66db Mon Sep 17 00:00:00 2001 From: Smit-create Date: Fri, 11 Aug 2023 10:29:51 +0530 Subject: [PATCH 1/2] set linker language --- integration_tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration_tests/CMakeLists.txt b/integration_tests/CMakeLists.txt index df1fefe7a3..72295a305b 100644 --- a/integration_tests/CMakeLists.txt +++ b/integration_tests/CMakeLists.txt @@ -375,6 +375,7 @@ macro(COMPILE) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.py VERBATIM) add_library(${name} OBJECT ${name}.o) + set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C) elseif(KIND STREQUAL "c") add_custom_command( OUTPUT ${name}.c @@ -382,6 +383,7 @@ macro(COMPILE) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.py VERBATIM) add_library(${name} OBJECT ${name}.c) + set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C) target_link_libraries(${name} lpython_rtlib) elseif(KIND STREQUAL "cpython") # CPython test From d61f30aa05bffd1ca26cb6d8c720170a7abac00e Mon Sep 17 00:00:00 2001 From: Smit-create Date: Sat, 12 Aug 2023 22:35:45 +0530 Subject: [PATCH 2/2] Use cmake build instead of make --- integration_tests/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_tests/run_tests.py b/integration_tests/run_tests.py index c84f73cb5f..543935387a 100755 --- a/integration_tests/run_tests.py +++ b/integration_tests/run_tests.py @@ -25,7 +25,7 @@ def run_test(backend): run_cmd(f"mkdir {BASE_DIR}/_lpython-tmp-test-{backend}", cwd=BASE_DIR) cwd = f"{BASE_DIR}/_lpython-tmp-test-{backend}" run_cmd(f"cmake -DKIND={backend} -DFAST={fast_tests} -DPYTHON_LIBS_REQ={python_libs_req} ..", cwd=cwd) - run_cmd(f"make -j{DEFAULT_THREADS_TO_USE}", cwd=cwd) + run_cmd(f"cmake --build . --parallel {DEFAULT_THREADS_TO_USE}", cwd=cwd) run_cmd(f"ctest -j{DEFAULT_THREADS_TO_USE} --output-on-failure", cwd=cwd)