Changeset 9e177ec in tol

Timestamp:

Sep 22, 2015, 9:21:48 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

634425b

Parents:

41890bb

Message:

#refs 1866, compilamos con cint solo si está disponible

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6864 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• CMakeLists.txt (modified) (3 diffs)
• btol/bgrammar/CMakeLists.txt (modified) (1 diff)
• btol/bgrammar/spfuninst.cpp (modified) (5 diffs)

tol/CMakeLists.txt

@@ -74 +74 @@
   if( CMAKE_BUILD_TYPE MATCHES Debug )
     # -fstack-protector-all -Wstack-protector -fno-omit-frame-pointer
-    set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "-fPIC -Wall")
+    # versiones recientes de gcc tienen estas opciones que pueden ser utiles: -fsanitize=address -fsanitize=alignment 
+    set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "-fPIC -mno-align-double -Wall")
   else( )
-    set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "-fPIC")
+    set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "-O2 -fPIC -mno-align-double")
   endif( )
   if( TOL_SUBLIBRARIES STREQUAL "" )
@@ -317 +318 @@
 # CINT configuration
 find_package( CintHeaders )
-if( CINT_HEADERS_FOUND AND TRACE_COMPONENTS_FOUND )
-  message( "CINT_INCLUDE_DIR = ${CINT_INCLUDE_DIR}" )
-
-endif( )
+if( CINT_HEADERS_FOUND )
+  if( TRACE_COMPONENTS_FOUND )
+    message( "CINT_INCLUDE_DIR = ${CINT_INCLUDE_DIR}" )
+  endif( )
+  set( HAVE_CINT 1 CACHE INTERNAL "" )
+else( )
+  unset( HAVE_CINT CACHE )
+endif( )
+
 # ZIPARCHIVE configuration
 find_package( ZipArchive REQUIRED )
@@ -391 +397 @@
 add_executable( tolcon tol.cpp )
 target_link_libraries( tolcon tol )
+
+#add_subdirectory( zippie_src )
 
 #message( STATUS "ALL_HEADERS_LIST ${ALL_HEADERS_LIST}" )

tol/btol/bgrammar/CMakeLists.txt

@@ -7 +7 @@
 
 target_include_directories( bgrammar PRIVATE 
-  ${PROJECT_SOURCE_DIR}
-  ${CINT_INCLUDE_DIR} )
+  ${PROJECT_SOURCE_DIR} )
+if( CINT_HEADERS_FOUND )
+  target_include_directories( bgrammar PRIVATE 
+    ${CINT_INCLUDE_DIR} )
+endif( )

tol/btol/bgrammar/spfuninst.cpp

@@ -52 +52 @@
 #include <tol/tol_bsymboltable.h>
 #include <tol/tol_bnameblock.h>
+#if HAVE_CINT
 #include "contrib/cint/tolCint.h"
+#endif
 
 
@@ -2291 +2293 @@
 
 
+#if HAVE_CINT
 //--------------------------------------------------------------------
 static BSyntaxObject* EvCint_export_to_tol(BGrammar* gra, const List* tre, BBool left)
@@ -2374 +2377 @@
   return(result);
 }
+#endif
 
 //--------------------------------------------------------------------
@@ -2921 +2925 @@
      EvAvoidErrNonDecAct);
 
- BText cint_url_link();
+ #if HAVE_CINT
+  BText cint_url_link();
 
   AddInstance("Cint.export_to_tol",
@@ -2942 +2947 @@
      cint_url_link(),
      EvCint_export_to_tol);
-
+#endif
 
   return(true);