d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

itk: unify patch

This commit is contained in:
Boris Nagaev 2016-10-24 02:04:13 +03:00
parent a21a967ba8
commit fbcbd9b81c
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/itk-1-fixes.patch Normal file
View File

@ -0,0 +1,37 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Wed, 2 Dec 2015 15:00:54 +0100
Subject: [PATCH] fix shared build
diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
index 1111111..2222222 100644
--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
+++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
@@ -6,6 +6,8 @@ set(PACKAGE "socket++")
include(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(strsignal SOCKETXX_HAVE_STRSIGNAL)
+add_definitions(-Dsocketxx_EXPORTS)
+
# specific
if(WIN32)
else()
@@ -67,6 +69,8 @@ if(UNIX)
)
endif()
+set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
set_target_properties (${SOCKETXX_LIBRARY_NAME}
PROPERTIES DEFINE_SYMBOL "socketxx_EXPORTS" )
@@ -105,4 +109,3 @@ if(NOT SOCKETXX_INSTALL_NO_DEVELOPMENT)
DESTINATION ${SOCKETXX_INSTALL_INCLUDE_DIR} COMPONENT Headers
)
endif()
-

26
src/itk-1-gdmcsocket.patch
View File

@ -1,26 +0,0 @@
diff -burN InsightToolkit-4.8.2.orig/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
--- InsightToolkit-4.8.2.orig/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt 2015-12-02 13:19:53.030344390 +0100
+++ InsightToolkit-4.8.2/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt 2015-12-02 13:32:36.094384138 +0100
@@ -6,6 +6,8 @@
include(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(strsignal SOCKETXX_HAVE_STRSIGNAL)
+add_definitions(-Dsocketxx_EXPORTS)
+
# specific
if(WIN32)
else()
@@ -67,6 +69,8 @@
)
endif()
+set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
if(WIN32)
target_link_libraries(${SOCKETXX_LIBRARY_NAME} ws2_32.lib)
@@ -103,4 +107,3 @@
DESTINATION ${SOCKETXX_INSTALL_INCLUDE_DIR} COMPONENT Headers
)
endif()
-