Skip to content
Commits on Source (2)
Description: modify and touch-up cmake file to build
Modify cmake so debian-packaged libraries are used instead and prevent SHA-1 fetching from repository (use hard-code)
Author: Shayan Doust <hello@shayandoust.me>
Last-Update: 2019-09-23
---
Index: bcalm/CMakeLists.txt
===================================================================
--- bcalm.orig/CMakeLists.txt 2019-09-23 06:21:21.709546638 +0100
+++ bcalm/CMakeLists.txt 2019-09-23 06:21:21.705546591 +0100
@@ -5,12 +5,12 @@
################################################################################
# Shortcuts
################################################################################
-SET (GATB_CORE_HOME ${PROJECT_SOURCE_DIR}/gatb-core)
+#SET (GATB_CORE_HOME ${PROJECT_SOURCE_DIR}/gatb-core)
################################################################################
# Define cmake modules directory
################################################################################
-FOREACH (path "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${GATB_CORE_HOME}/gatb-core/cmake")
+FOREACH (path "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
IF (EXISTS "${path}")
SET (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${path}")
ENDIF()
@@ -19,13 +19,15 @@
#############################
# getting git version
#from http://stackoverflow.com/questions/1435953/how-can-i-pass-git-sha1-to-compiler-as-definition-using-cmake
-exec_program(
- "git"
- ${CMAKE_CURRENT_SOURCE_DIR}
- ARGS "rev-parse --short HEAD"
- OUTPUT_VARIABLE VERSION_SHA1 )
+#exec_program(
+# "git"
+# ${CMAKE_CURRENT_SOURCE_DIR}
+# ARGS "rev-parse --short HEAD"
+# OUTPUT_VARIABLE VERSION_SHA1 )
+#
-add_definitions( -DGIT_SHA1="${VERSION_SHA1}" )
+# NEEDS CHANGING PER UPSTREAM CHANGE
+add_definitions( -DGIT_SHA1="ed86d2c")
################################################################################
@@ -39,7 +41,10 @@
# GATB CORE
-include (GatbCore)
+#include (GatbCore)
+include(GNUInstallDirs)
+
+link_directories(/usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial)
################################################################################
# TOOLS
@@ -70,7 +75,7 @@
include_directories (${PROGRAM_SOURCE_DIR})
file (GLOB_RECURSE ProjectFiles ${PROGRAM_SOURCE_DIR}/*.cpp)
add_executable(${program} ${ProjectFiles})
-target_link_libraries(${program} ${gatb-core-libraries})
+target_link_libraries(${program} gatbcore hdf5 z)
################################################################################
# DELIVERY
modify_cmake.patch