Tidy-up

faasm · Oct 19, 2020 · 96c9270 · 96c9270
1 parent 2524e05
commit 96c9270
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 build/
-install/
 
 # Clang
 .clangd

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,11 +82,6 @@ if(FAABRIC_BUILD_TESTS)
     add_subdirectory(tests/utils)
 endif()
 
-# Installation step
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
 # Install all headers from subdirectories but preserve the dir structure
 function(lib_headers libname) 
     file(GLOB LIB_HEADERS "${FAABRIC_INCLUDE_DIR}/faabric/${libname}/*.h") 

diff --git a/src/mpi/CMakeLists.txt b/src/mpi/CMakeLists.txt
@@ -24,12 +24,11 @@ set_target_properties(faabricmpi
 
 if(FAASM_BUILD_TYPE STREQUAL "wasm")
     set(LIB_DIRECTORY ${CMAKE_SYSROOT}/lib/wasm32-wasi)
-    set(HEADER_DEST ${CMAKE_SYSROOT}/include/faabric/mpi)
 
     install(TARGETS faabricmpi
         ARCHIVE DESTINATION ${LIB_DIRECTORY}
         LIBRARY DESTINATION ${LIB_DIRECTORY}
-        PUBLIC_HEADER DESTINATION ${HEADER_DEST}
+        PUBLIC_HEADER DESTINATION ${CMAKE_SYSROOT}/include/faabric/mpi
     )
 else()
     install(TARGETS faabricmpi
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     build/
-    install/
     # Clang
     .clangd
@@ Expand Down @@