Mercurial > mxe-octave
view src/vigra-1-cmake-static-linking.patch @ 2661:3567da505594
json-c update to version 0.10, using github downloads.
Squashed commit of the following:
commit a93e1e80e4a6b668009bd024923e387f71eff7a3
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 23:16:59 2012 +0200
Patches for:
- missing file
- remove check for rpl_* functions
commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 19:08:40 2012 +0200
Fixed indentation
commit 78b51e08e5174454495b8df547c4bccdc06bef73
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 01:13:08 2012 +0200
json-c compiles correctly (finally).
commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab
Author: Thomas Mayer <thomas@residuum.org>
Date: Fri Jul 13 22:16:41 2012 +0200
Changes to json-c files according to current MXE standards.
commit a533fe5439d56de76c2d3b9d634c597cba94ff52
Author: Thomas Mayer <thomas@residuum.org>
Date: Thu Jul 12 22:27:54 2012 +0200
Update to json-c 0.10, and use github repository.
author | Thomas Mayer <thomas@residuum.org> |
---|---|
date | Tue, 17 Jul 2012 23:18:18 +0200 |
parents | 00c25bce9a4c |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. This patch has been taken from: https://github.com/ukoethe/vigra/pull/115 From 88437f115f797c14692b06b20629c3b2fc2c6256 Mon Sep 17 00:00:00 2001 From: Joachim Schleicher <J.Schleicher@stud.uni-heidelberg.de> Date: Thu, 26 Apr 2012 19:00:27 +0200 Subject: [PATCH] modify cmake files for static linking * add definition -DVIGRA_STATIC_LIB if library is imported using cmake * change order of imports that is relevant if linking static --- config/FindOpenEXR.cmake | 9 +++++---- config/VigraConfig.cmake.in | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/FindOpenEXR.cmake b/config/FindOpenEXR.cmake index 0733d10..1e405b5 100644 --- a/config/FindOpenEXR.cmake +++ b/config/FindOpenEXR.cmake @@ -25,11 +25,11 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR) +FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf) +FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex) FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread) -FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath) -FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG @@ -38,6 +38,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG ) IF(OPENEXR_FOUND) - SET(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} - ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY}) + SET(OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} + ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY} + ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ) ENDIF(OPENEXR_FOUND) diff --git a/config/VigraConfig.cmake.in b/config/VigraConfig.cmake.in index f2af5dd..ddcae12 100644 --- a/config/VigraConfig.cmake.in +++ b/config/VigraConfig.cmake.in @@ -2,4 +2,9 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(Vigra_TOP_DIR "${SELF_DIR}/../../" ABSOLUTE) include(${SELF_DIR}/vigra-targets.cmake) +get_target_property(VIGRA_TYPE vigraimpex TYPE) +if(${VIGRA_TYPE} STREQUAL "STATIC_LIBRARY") + SET(VIGRA_STATIC_LIB True) + ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) +endif(${VIGRA_TYPE} STREQUAL "STATIC_LIBRARY") get_filename_component(Vigra_INCLUDE_DIRS "${Vigra_TOP_DIR}/include/" ABSOLUTE) -- 1.7.2.5