mnemonic-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [1/2] incubator-mnemonic git commit: MNEMONIC-86: Link external native libraries in static way
Date Fri, 05 Aug 2016 22:54:42 GMT
Repository: incubator-mnemonic
Updated Branches:
  refs/heads/master 632b903b2 -> e65c540f7


MNEMONIC-86: Link external native libraries in static way


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/c3a1b345
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/c3a1b345
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/c3a1b345

Branch: refs/heads/master
Commit: c3a1b3453398c8189e5bfc6148bd905cd51255e6
Parents: 632b903
Author: Wang, Gang(Gary) <gang1.wang@intel.com>
Authored: Tue Aug 2 15:12:57 2016 -0700
Committer: Wang, Gang(Gary) <gang1.wang@intel.com>
Committed: Tue Aug 2 15:12:57 2016 -0700

----------------------------------------------------------------------
 .../mnemonic-nvml-vmem-service/src/main/native/CMakeLists.txt    | 4 ++--
 .../mnemonic-pmalloc-service/src/main/native/CMakeLists.txt      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/c3a1b345/mnemonic-memory-services/mnemonic-nvml-vmem-service/src/main/native/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/mnemonic-memory-services/mnemonic-nvml-vmem-service/src/main/native/CMakeLists.txt
b/mnemonic-memory-services/mnemonic-nvml-vmem-service/src/main/native/CMakeLists.txt
index 7878968..033c101 100644
--- a/mnemonic-memory-services/mnemonic-nvml-vmem-service/src/main/native/CMakeLists.txt
+++ b/mnemonic-memory-services/mnemonic-nvml-vmem-service/src/main/native/CMakeLists.txt
@@ -38,14 +38,14 @@ include_directories(${JNI_INCLUDE_DIRS})
 find_package(Threads REQUIRED)
 include_directories(${CMAKE_THREAD_LIBS_INIT})
 
-find_library(LIBVMEM_LIBRARIES vmem)
+find_library(LIBVMEM_LIBRARIES NAMES libvmem.a)
 if (NOT LIBVMEM_LIBRARIES)
    message(FATAL_ERROR "not found vmem library")
 endif (NOT LIBVMEM_LIBRARIES)
 
 add_library(vmemallocator SHARED common.c org_apache_mnemonic_service_allocatorservice_internal_VMemServiceImpl.c)
 target_include_directories(vmemallocator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(vmemallocator vmem)
+target_link_libraries(vmemallocator ${LIBVMEM_LIBRARIES})
 
 include (InstallRequiredSystemLibraries)
 set (CPACK_RESOURCE_FILE_LICENSE

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/c3a1b345/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt
b/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt
index f3d505e..0652619 100644
--- a/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt
+++ b/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt
@@ -38,14 +38,14 @@ include_directories(${JNI_INCLUDE_DIRS})
 find_package(Threads REQUIRED)
 include_directories(${CMAKE_THREAD_LIBS_INIT})
 
-find_library(LIBPMALLOC_LIBRARIES pmalloc)
+find_library(LIBPMALLOC_LIBRARIES NAMES libpmalloc_static.a)
 if (NOT LIBPMALLOC_LIBRARIES)
    message(FATAL_ERROR "not found pmalloc library")
 endif (NOT LIBPMALLOC_LIBRARIES)
 
 add_library(pmallocallocator SHARED common.c org_apache_mnemonic_service_allocatorservice_internal_PMallocServiceImpl.c)
 target_include_directories(pmallocallocator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(pmallocallocator pmalloc)
+target_link_libraries(pmallocallocator ${LIBPMALLOC_LIBRARIES})
 
 include (InstallRequiredSystemLibraries)
 set (CPACK_RESOURCE_FILE_LICENSE


Mime
View raw message