rdieter pushed to kstars (master). "fix htmesh build"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 20:33:35 UTC 2015


>From 43a451522bb9920d322f4ab87799f60c444ac053 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at gmail.com>
Date: Tue, 14 Apr 2015 15:33:15 -0500
Subject: fix htmesh build


diff --git a/kstars-15.04.0-htmesh_PIC.patch b/kstars-15.04.0-htmesh_PIC.patch
index 5bb6b37..7cb34ff 100644
--- a/kstars-15.04.0-htmesh_PIC.patch
+++ b/kstars-15.04.0-htmesh_PIC.patch
@@ -1,12 +1,20 @@
 diff -up kstars-15.04.0/kstars/htmesh/CMakeLists.txt.PIC kstars-15.04.0/kstars/htmesh/CMakeLists.txt
 --- kstars-15.04.0/kstars/htmesh/CMakeLists.txt.PIC	2015-04-03 08:30:27.000000000 -0500
-+++ kstars-15.04.0/kstars/htmesh/CMakeLists.txt	2015-04-14 14:25:41.776499522 -0500
-@@ -26,7 +26,7 @@ set(HTMesh_LIB_SRCS
++++ kstars-15.04.0/kstars/htmesh/CMakeLists.txt	2015-04-14 15:32:18.358898131 -0500
+@@ -25,8 +25,7 @@ set(HTMesh_LIB_SRCS
+ 
  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
  #TODO is there KF5_ENABLE_EXCEPTIONS?
- set (CMAKE_CXX_FLAGS "-fexceptions")
+-set (CMAKE_CXX_FLAGS "-fexceptions")
 -#set (CMAKE_CXX_FLAGS "-fPIC") # If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in th e perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details.
-+set (CMAKE_CXX_FLAGS "-fPIC") # If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in th e perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details.
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
  
  add_library(htmesh STATIC ${HTMesh_LIB_SRCS})
  
+@@ -36,3 +35,6 @@ set_target_properties(htmesh PROPERTIES
+     VERSION 1.0.0
+     SOVERSION 1)
+ install(TARGETS htmesh ${INSTALL_TARGETS_DEFAULT_ARGS} )
++
++# If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in th e perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details.
++set_property(TARGET htmesh PROPERTY POSITION_INDEPENDENT_CODE YES)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kstars.git/commit/?h=master&id=43a451522bb9920d322f4ab87799f60c444ac053


More information about the scm-commits mailing list