[med-svn] [Git][med-team/simka][master] Fix linking error

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / simka


Commits:
b5d5ae64 by Shayan Doust at 2019-09-11T22:22:45Z
Fix linking error
Template functions must be entirely written in header but gatb-core has worked around this by cmake-generated templates. "Hard-code" some gatb-core variables.

- - - - -


1 changed file:

- debian/patches/use_debian_packaged_libraries.patch


Changes:

=====================================
debian/patches/use_debian_packaged_libraries.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-09-09
 
 Index: simka/CMakeLists.txt
 ===================================================================
---- simka.orig/CMakeLists.txt	2019-09-09 05:24:49.083238549 +0100
-+++ simka/CMakeLists.txt	2019-09-09 05:25:25.950918766 +0100
+--- simka.orig/CMakeLists.txt	2019-09-11 23:17:36.800233418 +0100
++++ simka/CMakeLists.txt	2019-09-11 23:17:59.436191116 +0100
 @@ -42,7 +42,10 @@
   SET (GATB_CORE_EXCLUDE_EXAMPLES  1)
  
@@ -20,7 +20,19 @@ Index: simka/CMakeLists.txt
  
  ################################################################################
  # TOOL
-@@ -78,18 +81,18 @@
+@@ -62,8 +65,10 @@
+ #       - from simka source
+ include_directories (include ${gatb-core-includes} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/minikc ${PROJECT_SOURCE_DIR}/src)
+ 
++list (APPEND KSIZE_DEFAULT_LIST  32   64   96  128  160  192  224  256)
++
+ # we generate one file per template specialization
+-FOREACH (KSIZE ${gatb-core-klist})
++FOREACH (KSIZE ${KSIZE_DEFAULT_LIST})
+     configure_file (
+         ${PROJECT_SOURCE_DIR}/src/core/SimkaAlgorithmTemplate.cpp.in
+         ${PROJECT_BINARY_DIR}/src/core/template/SimkaAlgorithmTemplate_${KSIZE}.cpp
+@@ -78,18 +83,18 @@
  set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin)
  
  add_executable        (simka  src/SimkaPotara.cpp ${ProjectFiles})



View it on GitLab: https://salsa.debian.org/med-team/simka/commit/b5d5ae643f229fc2fd6eff0f5642343efd2d2f67

-- 
View it on GitLab: https://salsa.debian.org/med-team/simka/commit/b5d5ae643f229fc2fd6eff0f5642343efd2d2f67
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190911/5439ebca/attachment-0001.html>