Merge pull request lcompilers#156 from certik/ci-win2

CMake: libraries in the same dir on all platforms
virendrakabra14 · Feb 22, 2022 · 8d8d722 · 8d8d722
2 parents bf6a743 + ddfd564
commit 8d8d722
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/ci/build.xsh b/ci/build.xsh
@@ -64,7 +64,7 @@ jupyter kernelspec list --json
 
 cp lpython-$lpython_version/test-bld/src/bin/lpython src/bin
 if $WIN == "1":
-    cp lpython-$lpython_version/test-bld/src/runtime/legacy/lfortran_runtime* src/runtime/
+    cp lpython-$lpython_version/test-bld/src/runtime/lfortran_runtime* src/runtime/
 else:
     cp lpython-$lpython_version/test-bld/src/runtime/liblfortran_runtime* src/runtime/
 cp lpython-$lpython_version/test-bld/src/runtime/*.mod src/runtime/

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
@@ -130,3 +130,8 @@ install(TARGETS lpython
     ARCHIVE DESTINATION share/lpython/lib
     LIBRARY DESTINATION share/lpython/lib
 )
+
+set_target_properties(lpython PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<0:>
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<0:>
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<0:>)
diff --git a/src/lpython/tests/CMakeLists.txt b/src/lpython/tests/CMakeLists.txt
@@ -42,6 +42,11 @@ add_executable(test_lfortran ${SRC})
 target_link_libraries(test_lfortran lfortran_lib p::doctest)
 add_test(test_lfortran ${PROJECT_BINARY_DIR}/test_lfortran)
 
+set_target_properties(test_lfortran PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<0:>
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<0:>
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<0:>)
+
 if (WITH_LLVM)
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         target_link_options(test_lfortran PRIVATE "LINKER:--export-dynamic")

diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt
@@ -3,10 +3,14 @@ set(SRC
 )
 add_library(lfortran_runtime SHARED ${SRC})
 set_target_properties(lfortran_runtime PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY ..)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>)
 add_library(lfortran_runtime_static STATIC ${SRC})
 set_target_properties(lfortran_runtime_static PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY ..)
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../$<0:>)
 install(TARGETS lfortran_runtime lfortran_runtime_static
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     ARCHIVE DESTINATION share/lpython/lib