[irstlm] 98/126: src/CMakeLists.txt

[Giulio Paci]

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

giuliopaci-guest pushed a commit to annotated tag adaptiveLM.v0.1
in repository irstlm.

commit d7e4c320a0d672d366a1a2e5e6f1ecc2fd9121ce
Merge: 3da5e76 95d5d6f
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Mon Sep 21 14:23:48 2015 +0200

    src/CMakeLists.txt

 src/CMakeLists.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --cc src/CMakeLists.txt
index a23784e,08a765d..ca7ebf8
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -6,7 -6,19 +6,23 @@@ ADD_DEFINITIONS("-D_LARGE_FILES"
  ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
  ADD_DEFINITIONS("-DMYCODESIZE=3")
  ADD_DEFINITIONS("-DDEBUG")
++<<<<<<< HEAD
 +ADD_DEFINITIONS("-DTRACE_LEVEL=1")
++=======
+ #ADD_DEFINITIONS("-DTRACE_LEVEL=1")
+ 
+ if (TRACE_LEVEL)
+   ADD_DEFINITIONS("-DTRACE_LEVEL=${TRACE_LEVEL}")
+ endif()
+ 
+ if (OPTION)
+   ADD_DEFINITIONS("-DOPTION_${OPTION}")
+ endif()
+ 
+ if (SOLUTION)
+   ADD_DEFINITIONS("-DSOLUTION_${SOLUTION}")
+ endif()
++>>>>>>> 95d5d6f683175a7f0fed8815fd89ca3da3717578
  
  if (CXX0)
    MESSAGE( STATUS "HAVE_CXX0=true; hence, variable HAVE_CXX0 is set" )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/irstlm.git