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

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +8 lines)
Line  Link Here
0
-- darktable-0.9.3.orig/src/CMakeLists.txt
0
++ darktable-0.9.3/src/CMakeLists.txt
Lines 290-310 Link Here
290
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c
290
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c
291
  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../tools/create_metadata.sh ${CMAKE_CURRENT_SOURCE_DIR}/../tools/metadata.txt ${CMAKE_CURRENT_BINARY_DIR}
291
  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../tools/create_metadata.sh ${CMAKE_CURRENT_SOURCE_DIR}/../tools/metadata.txt ${CMAKE_CURRENT_BINARY_DIR}
292
)
292
)
293
293
add_custom_target(metadata_gen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
294
# this is a dummy library whose sole purpose is to serve as a dependency for subdirs, such as imageio/storage/gallery.
295
# cmake can't depend on custom targets in other directories than the current one.
296
add_library(metadata_dummy ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
297
294
298
#
295
#
299
# build libdarktable
296
# build libdarktable
300
#
297
#
301
add_library(lib_darktable STATIC SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${SOURCES})
298
add_library(lib_darktable SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${SOURCES})
299
add_dependencies(lib_darktable metadata_gen)
302
if(APPLE)
300
if(APPLE)
303
  set_target_properties(lib_darktable PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib/darktable")
301
  set_target_properties(lib_darktable PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib/darktable")
304
endif(APPLE)
302
endif(APPLE)
305
set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
303
set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
306
set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
304
set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
307
305
target_link_libraries(lib_darktable ${LIBS})
308
306
309
#
307
#
310
# the libraw part is a bit of a hack:
308
# the libraw part is a bit of a hack:
Lines 329-335 Link Here
329
  add_dependencies(lib_darktable rawspeed)
327
  add_dependencies(lib_darktable rawspeed)
330
  add_library(rawspeed_static STATIC IMPORTED)
328
  add_library(rawspeed_static STATIC IMPORTED)
331
  set_target_properties(rawspeed_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/rawspeed/librawspeed.a)
329
  set_target_properties(rawspeed_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/rawspeed/librawspeed.a)
332
  target_link_libraries(lib_darktable ${LIBS} rawspeed_static)
330
  target_link_libraries(lib_darktable rawspeed_static)
333
  # compile rawspeed
331
  # compile rawspeed
334
  add_subdirectory(external/rawspeed)
332
  add_subdirectory(external/rawspeed)
335
endif(NOT DONT_USE_RAWSPEED)
333
endif(NOT DONT_USE_RAWSPEED)
336
-- darktable-0.9.3.orig/src/imageio/storage/CMakeLists.txt
334
++ darktable-0.9.3/src/imageio/storage/CMakeLists.txt
Lines 10-16 Link Here
10
foreach(module ${MODULES} ${MODULES_EXPERIMENTAL})
10
foreach(module ${MODULES} ${MODULES_EXPERIMENTAL})
11
	add_library(${module} MODULE "${module}.c")
11
	add_library(${module} MODULE "${module}.c")
12
endforeach(module)
12
endforeach(module)
13
add_dependencies(gallery metadata_dummy)
13
add_dependencies(gallery metadata_gen)
14
14
15
foreach(module ${MODULES})
15
foreach(module ${MODULES})
16
	target_link_libraries(${module} ${LIBS})
16
	target_link_libraries(${module} ${LIBS})

Return to bug 408323