Commit 1729cbb9 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Tweak the dependencies for OSX

parent 1f9b02df
......@@ -91,8 +91,9 @@ if (MSVC)
add_subdirectory( ext_patch )
add_subdirectory( ext_png2ico )
endif (MSVC)
add_subdirectory( ext_zlib )
add_subdirectory( ext_iconv )
add_subdirectory( ext_gettext )
add_subdirectory( ext_zlib )
add_subdirectory( ext_libxml2 )
add_subdirectory( ext_libxslt )
add_subdirectory( ext_boost )
......
......@@ -155,7 +155,7 @@ ExternalProject_Add(
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kguiaddons
DEPENDS ext_gettext ext_kguiaddons
)
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59917fa..b56e0af 100644
index 178117e..497395d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,10 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ki18n_install(po)
@@ -54,11 +54,11 @@ if(MSVC)
endif()
add_definitions(-DTRANSLATION_DOMAIN=\"ki18n5\")
-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
- ki18n_install(po)
-endif()
+#if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+# ki18n_install(po)
+#endif()
add_subdirectory(src)
-add_subdirectory(autotests)
+
+if (BUILD_TESTING)
+ add_subdirectory(autotests)
+endif()
+#add_subdirectory(autotests)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5I18n")
diff --git a/cmake/KF5I18NMacros.cmake b/cmake/KF5I18NMacros.cmake
index 53ba812..db8ea98 100644
index 53ba812..db8ea98 100755
--- a/cmake/KF5I18NMacros.cmake
+++ b/cmake/KF5I18NMacros.cmake
@@ -25,14 +25,9 @@
......
SET(PREFIX_ext_gettext "${EXTPREFIX}" )
if (MSVC)
ExternalProject_Add(
ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext-0.18.tar.gz
URL_MD5 d52a3e061032a1ed13856d42fc86f0fd
PATCH_COMMAND -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gettext-0.18-20130319.diff
INSTALL_DIR ${PREFIX_ext_gettext}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gettext} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch ext_iconv
)
else (MSVC)
ExternalProject_Add( ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext-0.19.6.tar.gz
URL_MD5 6d1447f8c5c45c329371ef4bfe7d79a5
INSTALL_DIR ${PREFIX_ext_gettext}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_iconv
)
endif (MSVC)
This diff is collapsed.
......@@ -6,7 +6,7 @@ ExternalProject_Add( ext_jpeg
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
INSTALL_DIR ${PREFIX_ext_jpeg}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
......@@ -17,7 +17,7 @@ ExternalProject_Add( ext_jpeg
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_jpeg} ${GLOBAL_AUTOMAKE_PROFILE}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_jpeg} ${GLOBAL_AUTOMAKE_PROFILE} --without-simd
BUILD_COMMAND make
INSTALL_COMMAND make install
......
......@@ -2,7 +2,7 @@ SET(PREFIX_ext_libraw "${EXTPREFIX}" )
ExternalProject_Add( ext_libraw
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/LibRaw-0.17.1.tar.gz
URL_MD5 fe35bbb422d42b6a1454e54f9b135fc6
URL_MD5 1d272599e73b2c1d718621b68dcae5a8
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libraw.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libraw} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......
......@@ -2,8 +2,8 @@ SET(EXTPREFIX_ocio "${EXTPREFIX}" )
ExternalProject_Add(
ext_ocio
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/imageworks-OpenColorIO-v1.0.8-0-g19ed2e3.tar.gz
URL_MD5 9838f5f1cf624a3d1253241f22e2179a
URL http://files.kde.org/krita/build/dependencies/opencolorio-a557a85454ee1ffa8cb66f8a96238e079c452f08.tgz
URL_MD5 c7db4cdcac40ab12870cdeb6bbd0b875
INSTALL_DIR ${EXTPREFIX_ocio}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF
......
......@@ -4,6 +4,8 @@ ExternalProject_Add( ext_openexr
URL http://files.kde.org/krita/build/dependencies/openexr-2.2.0.tar.gz
URL_MD5 b64e931c82aa3790329c21418373db4e
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/openexr.diff
INSTALL_DIR ${PREFIX_ext_openexr}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_openexr} -DILMBASE_PACKAGE_PREFIX=${PREFIX_ext_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
......
diff -Naur openexr-1.7.1-orig/CMakeLists.txt openexr-1.7.1/CMakeLists.txt
--- openexr-1.7.1-orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ openexr-1.7.1/CMakeLists.txt 2013-06-04 13:08:47.569992308 +0200
@@ -0,0 +1,101 @@
+project(ilmbase)
+
+cmake_minimum_required(VERSION 2.8)
+
+set(openexr_srcs_IlmImf
+ IlmImf/ImfAcesFile.cpp
+ IlmImf/ImfAttribute.cpp
+ IlmImf/ImfB44Compressor.cpp
+ IlmImf/ImfBoxAttribute.cpp
+ IlmImf/ImfCRgbaFile.cpp
+ IlmImf/ImfChannelList.cpp
+ IlmImf/ImfChannelListAttribute.cpp
+ IlmImf/ImfChromaticities.cpp
+ IlmImf/ImfChromaticitiesAttribute.cpp
+ IlmImf/ImfCompressionAttribute.cpp
+ IlmImf/ImfCompressor.cpp
+ IlmImf/ImfConvert.cpp
+ IlmImf/ImfDoubleAttribute.cpp
+ IlmImf/ImfEnvmap.cpp
+ IlmImf/ImfEnvmapAttribute.cpp
+ IlmImf/ImfFloatAttribute.cpp
+ IlmImf/ImfFrameBuffer.cpp
+ IlmImf/ImfFramesPerSecond.cpp
+ IlmImf/ImfHeader.cpp
+ IlmImf/ImfHuf.cpp
+ IlmImf/ImfIO.cpp
+ IlmImf/ImfInputFile.cpp
+ IlmImf/ImfIntAttribute.cpp
+ IlmImf/ImfKeyCode.cpp
+ IlmImf/ImfKeyCodeAttribute.cpp
+ IlmImf/ImfLineOrderAttribute.cpp
+ IlmImf/ImfLut.cpp
+ IlmImf/ImfMatrixAttribute.cpp
+ IlmImf/ImfMisc.cpp
+ IlmImf/ImfMultiView.cpp
+ IlmImf/ImfOpaqueAttribute.cpp
+ IlmImf/ImfOutputFile.cpp
+ IlmImf/ImfPizCompressor.cpp
+ IlmImf/ImfPreviewImage.cpp
+ IlmImf/ImfPreviewImageAttribute.cpp
+ IlmImf/ImfPxr24Compressor.cpp
+ IlmImf/ImfRational.cpp
+ IlmImf/ImfRationalAttribute.cpp
+ IlmImf/ImfRgbaFile.cpp
+ IlmImf/ImfRgbaYca.cpp
+ IlmImf/ImfRleCompressor.cpp
+ IlmImf/ImfScanLineInputFile.cpp
+ IlmImf/ImfStandardAttributes.cpp
+ IlmImf/ImfStdIO.cpp
+ IlmImf/ImfStringAttribute.cpp
+ IlmImf/ImfStringVectorAttribute.cpp
+ IlmImf/ImfTestFile.cpp
+ IlmImf/ImfThreading.cpp
+ IlmImf/ImfTileDescriptionAttribute.cpp
+ IlmImf/ImfTileOffsets.cpp
+ IlmImf/ImfTiledInputFile.cpp
+ IlmImf/ImfTiledMisc.cpp
+ IlmImf/ImfTiledOutputFile.cpp
+ IlmImf/ImfTiledRgbaFile.cpp
+ IlmImf/ImfTimeCode.cpp
+ IlmImf/ImfTimeCodeAttribute.cpp
+ IlmImf/ImfVecAttribute.cpp
+ IlmImf/ImfVersion.cpp
+ IlmImf/ImfWav.cpp
+ IlmImf/ImfZipCompressor.cpp
+ IlmImf/b44ExpLogTable.cpp
+ )
+file(GLOB openexr_header_IlmImf IlmImf/*.h)
+
+include_directories(${CMAKE_INSTALL_PREFIX}/include)
+link_directories(${CMAKE_INSTALL_PREFIX}/lib)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/IlmImf)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+if(WIN32)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/config.windows)
+else(WIN32)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/config)
+endif(WIN32)
+
+# add_executable(toFloat Half/toFloat.cpp)
+# add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
+# COMMAND $<TARGET_FILE:toFloat> > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
+# #DEPENDS toFloat
+# )
+# add_custom_target(toFloat_h #DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h)
+#
+# add_executable(eLut Half/eLut.cpp)
+# add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+# COMMAND $<TARGET_FILE:eLut> > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+# #DEPENDS eLut
+# )
+# add_custom_target(eLut_h #DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/eLut.h)
+
+add_library(IlmImf STATIC ${openexr_srcs_IlmImf})
+install(TARGETS IlmImf LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)
+install(FILES ${openexr_header_IlmImf} DESTINATION include)
+
+# add_dependencies(Half toFloat_h eLut_h)
+
diff -Naur openexr-1.7.1-orig/IlmImf/ImfAttribute.h openexr-1.7.1/IlmImf/ImfAttribute.h
--- openexr-1.7.1-orig/IlmImf/ImfAttribute.h 2012-07-18 01:27:26.000000000 +0200
+++ openexr-1.7.1/IlmImf/ImfAttribute.h 2013-06-06 13:29:54.057810657 +0200
@@ -400,6 +400,7 @@
diff --git a/IlmImf/CMakeLists.txt b/IlmImf/CMakeLists.txt
index 18d90ed..6c2f48c 100644
--- a/IlmImf/CMakeLists.txt
+++ b/IlmImf/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR 1)
ADD_EXECUTABLE ( b44ExpLogTable
b44ExpLogTable.cpp
)
+set_target_properties(b44ExpLogTable PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/bin")
} // namespace Imf
TARGET_LINK_LIBRARIES ( b44ExpLogTable
Half
@@ -22,6 +23,7 @@ ADD_CUSTOM_COMMAND (
ADD_EXECUTABLE ( dwaLookups
dwaLookups.cpp
)
+set_target_properties(dwaLookups PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/bin")
+#if 0
#if defined(OPENEXR_DLL) && defined(_MSC_VER)
// Tell MS VC++ to disable "non dll-interface class used as base
// for dll-interface class" and "no suitable definition provided
@@ -418,6 +419,7 @@
#pragma warning(default : 4251)
#undef EXTERN_TEMPLATE
#endif
+#endif
// Metrowerks compiler wants the .cpp file inlined, too
#ifdef __MWERKS__
TARGET_LINK_LIBRARIES ( dwaLookups
Half
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment