Add all dependent libraries to mlsl linkage interface (#2501)

* Add all dependent libraries to mlsl linkage interface * Use ${CMAKE_SHARED_LIBRARY_PREFIX} and ${CMAKE_SHARED_LIBRARY_SUFFIX}
NervanaSystems · Feb 28, 2019 · 9571497 · 9571497
1 parent 2a7e409
commit 9571497
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/cmake/external_mlsl.cmake b/cmake/external_mlsl.cmake
@@ -43,12 +43,17 @@ ExternalProject_Add(
     EXCLUDE_FROM_ALL TRUE
     )
 
+add_library(libmlsl INTERFACE)
 ExternalProject_Get_Property(MLSL SOURCE_DIR)
 ExternalProject_Get_Property(MLSL INSTALL_DIR)
-add_library(libmlsl INTERFACE)
 target_include_directories(libmlsl SYSTEM INTERFACE ${SOURCE_DIR}/include)
-target_link_libraries(libmlsl INTERFACE ${INSTALL_DIR}/intel64/lib/thread/libmlsl.so)
-link_directories(${INSTALL_DIR}/intel64/lib/thread)
+
+set(MLSL_LINK_LIBRARIES
+    ${INSTALL_DIR}/intel64/lib/thread/${CMAKE_SHARED_LIBRARY_PREFIX}mlsl${CMAKE_SHARED_LIBRARY_SUFFIX}
+    ${INSTALL_DIR}/intel64/lib/thread/${CMAKE_SHARED_LIBRARY_PREFIX}mpi${CMAKE_SHARED_LIBRARY_SUFFIX}
+    ${INSTALL_DIR}/intel64/lib/thread/${CMAKE_SHARED_LIBRARY_PREFIX}fabric${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+target_link_libraries(libmlsl PRIVATE INTERFACE ${MLSL_LINK_LIBRARIES})
 add_dependencies(libmlsl MLSL)
 
 #installation