Changeset 14d3171 in tol

Timestamp:

Oct 2, 2015, 7:12:19 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

0064724

Parents:

00fb955

Message:

refs #1866, -fPIC solo se usa en Linux 64 bit

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

File:

• tol/CMakeLists.txt (modified) (2 diffs)

tol/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required( VERSION 2.8 )
 project( TOL )
+
+#-----------------------------------------------------------------------------
+#
+# To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
+# used when making a shared object; recompile with -fPIC
+# See http://www.cmake.org/pipermail/cmake/2007-May/014350.html
+#
+if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT WIN32 )
+  set( NEED_FPIC "-fPIC" )
+else( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT WIN32 )
+  unset( NEED_FPIC )
+endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT WIN32 )
 
 if( TOL_EXTERNAL_DEVEL_DIR )
@@ -73 +85 @@
   #message( STATUS "add_library( ${name} OBJECT ${ARGN} )" )
   if( CMAKE_BUILD_TYPE MATCHES Debug )
-    # -fstack-protector-all -Wstack-protector -fno-omit-frame-pointer
-    # 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 "-O2 -fPIC -mno-align-double")
-  endif( )
+    #set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "-fPIC -Wall")
+    target_compile_options( ${name} PRIVATE "-Wall" )
+  endif( CMAKE_BUILD_TYPE MATCHES Debug )
+  if( NEED_FPIC )
+    target_compile_options( ${name} PRIVATE "-fPIC" )
+  endif( NEED_FPIC )
   if( TOL_SUBLIBRARIES STREQUAL "" )
     set( TOL_SUBLIBRARIES $<TARGET_OBJECTS:${name}> CACHE INTERNAL "" )