[med-svn] [hilive] 01/03: Somehow CMakeLists.txt was diverging from upstream branch

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository hilive.

commit fec6dc7af4f5f906fce7ac7037132a6dfb944887
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jan 28 07:10:44 2017 +0100

    Somehow CMakeLists.txt was diverging from upstream branch
---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99d5ae2..4c6b203 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set (HiLive_VERSION_MINOR 3)
 set (HiLive_K 15 CACHE INT "Set the k-mer length for index and mapper")
 
 # Set flags for compilation
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -pthread -W -Wall -std=gnu++11 -O0")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -pthread -W -Wall -std=gnu++11 -O0")
 
 
 # configure a header file to pass some of the CMake settings to the source code
@@ -28,8 +28,8 @@ include_directories("${PROJECT_BINARY_DIR}")
 #############################
 ### setup seqan libraries ###
 
-set (CMAKE_MODULE_PATH "/usr/share/seqan/cmake") # adjust this to [pathToSeqanCode]/util/cmake
-#set (SEQAN_INCLUDE_PATH "/home/schulzeja/masterthesis/tools/seqan-src/include/") # adjust this to [pathToSeqanCode]/include
+set (CMAKE_MODULE_PATH "/home/schulzeja/masterthesis/tools/seqan-src/util/cmake") # adjust this to [pathToSeqanCode]/util/cmake
+set (SEQAN_INCLUDE_PATH "/home/schulzeja/masterthesis/tools/seqan-src/include/") # adjust this to [pathToSeqanCode]/include
 
 # Configure SeqAn, enabling features for libbz2 and zlib.
 #set (SEQAN_FIND_DEPENDENCIES ZLIB BZip2) # original version from seqan tutorial
@@ -84,7 +84,7 @@ foreach (x ${LIB_NAMES})
 	list(APPEND LIB_LIST "lib/${x}.cpp")
 endforeach()
 add_library(HiLiveLibs ${LIB_LIST})
-set_target_properties(HiLiveLibs PROPERTIES SKIP_BUILD_RPATH TRUE)
+
 
 #############################
 ### Build the executables ###

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hilive.git