Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 545008 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-2 / +2 lines)
Lines 43-50 Link Here
43
pkg_check_modules(ORC REQUIRED orc-0.4)
43
pkg_check_modules(ORC REQUIRED orc-0.4)
44
ENDIF(NOT MINGW)
44
ENDIF(NOT MINGW)
45
45
46
#FIND_PACKAGE(LibRaw 0.13 REQUIRED)
46
FIND_PACKAGE(LibRaw 0.13 REQUIRED)
47
#pkg_check_modules(LIBRAW REQUIRED libraw)
47
pkg_check_modules(LIBRAW REQUIRED libraw)
48
48
49
#find_package (LibXML++ REQUIRED)
49
#find_package (LibXML++ REQUIRED)
50
#pkg_check_modules(LIBXML REQUIRED libxml++-2.6) 
50
#pkg_check_modules(LIBXML REQUIRED libxml++-2.6) 
(-)a/src/CMakeLists.txt (-17 / +6 lines)
Lines 51-59 Link Here
51
include_directories(${SIGC2_INCLUDE_DIRS})
52
include_directories(${SIGC2_INCLUDE_DIRS})
52
link_directories(${SIGC2_LIBRARY_DIRS})
53
link_directories(${SIGC2_LIBRARY_DIRS})
53
54
54
55
if(LIBRAW_FOUND)
55
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
56
  link_directories( ${LIBRAW_LIBRARY_DIRS}  )
56
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
57
  include_directories( ${LIBRAW_INCLUDE_DIRS}  )  
58
endif()
57
59
58
#if(LENSFUN_FOUND)
60
#if(LENSFUN_FOUND)
59
#  link_directories( ${LENSFUN_LIBRARY_DIRS}  )
61
#  link_directories( ${LENSFUN_LIBRARY_DIRS}  )
Lines 140-157 Link Here
140
FILE(GLOB OpIncludes operations/*.hh operations/gmic/*.hh)
142
FILE(GLOB OpIncludes operations/*.hh operations/gmic/*.hh)
141
FILE(GLOB OpSources operations/*.cc operations/gmic/*.cc)
143
FILE(GLOB OpSources operations/*.cc operations/gmic/*.cc)
142
144
143
#
144
# the libraw part is a bit of a hack:
145
# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
146
# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
147
# appended.
148
#
149
add_library(libraw_static STATIC IMPORTED)
150
set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LibRaw/liblibraw_r.a)
151
add_subdirectory(external/LibRaw)
152
list(APPEND LIB_DEPS libraw_r)
153
list(APPEND STATIC_LIBS libraw_static)
154
155
LIST(APPEND CMAKE_MODULE_PATH " ${CMAKE_SOURCE_DIR}/src/external/lensfun/cmake/modules ")
145
LIST(APPEND CMAKE_MODULE_PATH " ${CMAKE_SOURCE_DIR}/src/external/lensfun/cmake/modules ")
156
set(BUILD_STATIC "ON")
146
set(BUILD_STATIC "ON")
157
add_library(lensfun_static STATIC IMPORTED)
147
add_library(lensfun_static STATIC IMPORTED)
Lines 233-239 Link Here
233
  ${GOBJECT_LIBRARIES} 
223
  ${GOBJECT_LIBRARIES} 
234
  ${GTHREAD_LIBRARIES} 
224
  ${GTHREAD_LIBRARIES} 
235
  ${ZLIB_LIBRARIES}
225
  ${ZLIB_LIBRARIES}
236
  #${LIBRAW_LIBRARIES}  
226
  ${LIBRAW_LIBRARIES}  
237
  ${STATIC_LIBS}
227
  ${STATIC_LIBS}
238
  ${ORC_LIBRARIES}
228
  ${ORC_LIBRARIES}
239
  fftw3
229
  fftw3
Lines 267-273 Link Here
267
  ${GOBJECT_LIBRARIES} 
257
  ${GOBJECT_LIBRARIES} 
268
  ${GTHREAD_LIBRARIES} 
258
  ${GTHREAD_LIBRARIES} 
269
  ${ZLIB_LIBRARIES}
259
  ${ZLIB_LIBRARIES}
270
  #${LIBRAW_LIBRARIES}  
260
  ${LIBRAW_LIBRARIES}  
271
  ${STATIC_LIBS}
261
  ${STATIC_LIBS}
272
  ${ORC_LIBRARIES}
262
  ${ORC_LIBRARIES}
273
  fftw3
263
  fftw3

Return to bug 545008