Attachment #423230 for bug #545008

Lines 32-41 Link Here

(-)a/CMakeLists.txt (-4 / +4 lines)
32	MESSAGE( STATUS "GEXIV2_INCLUDE_DIRS: " ${GEXIV2_INCLUDE_DIRS} )	32	MESSAGE( STATUS "GEXIV2_INCLUDE_DIRS: " ${GEXIV2_INCLUDE_DIRS} )
33	MESSAGE( STATUS "GEXIV2_LIBRARY_DIRS: " ${GEXIV2_LIBRARY_DIRS} )	33	MESSAGE( STATUS "GEXIV2_LIBRARY_DIRS: " ${GEXIV2_LIBRARY_DIRS} )
34		34
35	#pkg_check_modules(LENSFUN lensfun)	35	pkg_check_modules(LENSFUN REQUIRED lensfun)
36	#MESSAGE( STATUS "LENSFUN_INCLUDE_DIRS: " ${LENSFUN_INCLUDE_DIRS} )	36	MESSAGE( STATUS "LENSFUN_INCLUDE_DIRS: " ${LENSFUN_INCLUDE_DIRS} )
37	#MESSAGE( STATUS "LENSFUN_LIBRARY_DIRS: " ${LENSFUN_LIBRARY_DIRS} )	37	MESSAGE( STATUS "LENSFUN_LIBRARY_DIRS: " ${LENSFUN_LIBRARY_DIRS} )
38	#MESSAGE( STATUS "LENSFUN_LIBRARIES: " ${LENSFUN_LIBRARIES})	38	MESSAGE( STATUS "LENSFUN_LIBRARIES: " ${LENSFUN_LIBRARIES})
39		39
40		40
41	IF(NOT MINGW)	41	IF(NOT MINGW)




include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)

if(LENSFUN_FOUND)
  link_directories( ${LENSFUN_LIBRARY_DIRS}  )
  include_directories( ${LENSFUN_INCLUDE_DIRS}  )  
  set(CMAKE_CXX_FLAGS "-DPF_HAS_LENSFUN")
endif()

include_directories(${OPENEXR_INCLUDE_DIRS})
include_directories(${TIFF_INCLUDE_DIRS})

list(APPEND LIB_DEPS libraw_r)
list(APPEND STATIC_LIBS libraw_static)

LIST(APPEND CMAKE_MODULE_PATH " ${CMAKE_SOURCE_DIR}/src/external/lensfun/cmake/modules ")
set(BUILD_STATIC "ON")
add_library(lensfun_static STATIC IMPORTED)
set_target_properties(lensfun_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/lensfun/libs/lensfun/liblensfun.a)
add_subdirectory(external/lensfun)
list(APPEND LIB_DEPS lensfun)
list(APPEND STATIC_LIBS lensfun_static)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)

#FILE(GLOB LibRawIncludes external/LibRaw/libraw/*.h)
#set(LibRawSources external/LibRaw/internal/dcraw_common.cpp external/LibRaw/src/libraw_cxx.cpp external/LibRaw/internal/dcraw_fileio.cpp external/LibRaw/internal/demosaic_packs.cpp external/LibRaw/src/libraw_c_api.cpp external/LibRaw/src/libraw_datastream.cpp)


  ${EXIF_LIBRARIES}
  ${EXIV2_LIBRARIES}
  ${GEXIV2_LIBRARIES}
  ${LENSFUN_LIBRARIES}
  ${SIGC2_LIBRARIES}
  ${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES} 
  ${PIXMAN_LIBRARIES} 

  ${EXIF_LIBRARIES}
  ${EXIV2_LIBRARIES}
  ${GEXIV2_LIBRARIES}
  ${LENSFUN_LIBRARIES}
  ${SIGC2_LIBRARIES}
  ${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES} 
  ${GLIBMM_LIBRARIES} 

Return to bug 545008

Lines 55-65 Link Here

(-)a/src/CMakeLists.txt (-16 / +7 lines)
55	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)	55	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
56	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)	56	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
57		57
58	#if(LENSFUN_FOUND)	58	if(LENSFUN_FOUND)
59	# link_directories( ${LENSFUN_LIBRARY_DIRS} )	59	link_directories( ${LENSFUN_LIBRARY_DIRS} )
60	# include_directories( ${LENSFUN_INCLUDE_DIRS} )	60	include_directories( ${LENSFUN_INCLUDE_DIRS} )
61	set(CMAKE_CXX_FLAGS "-DPF_HAS_LENSFUN")	61	set(CMAKE_CXX_FLAGS "-DPF_HAS_LENSFUN")
62	#endif()	62	endif()
63		63
64	include_directories(${OPENEXR_INCLUDE_DIRS})	64	include_directories(${OPENEXR_INCLUDE_DIRS})
65	include_directories(${TIFF_INCLUDE_DIRS})	65	include_directories(${TIFF_INCLUDE_DIRS})
Lines 152-166 Link Here
152	list(APPEND LIB_DEPS libraw_r)	152	list(APPEND LIB_DEPS libraw_r)
153	list(APPEND STATIC_LIBS libraw_static)	153	list(APPEND STATIC_LIBS libraw_static)
154		154
155	LIST(APPEND CMAKE_MODULE_PATH " ${CMAKE_SOURCE_DIR}/src/external/lensfun/cmake/modules ")
156	set(BUILD_STATIC "ON")
157	add_library(lensfun_static STATIC IMPORTED)
158	set_target_properties(lensfun_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/lensfun/libs/lensfun/liblensfun.a)
159	add_subdirectory(external/lensfun)
160	list(APPEND LIB_DEPS lensfun)
161	list(APPEND STATIC_LIBS lensfun_static)
162	INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
163
164	#FILE(GLOB LibRawIncludes external/LibRaw/libraw/*.h)	155	#FILE(GLOB LibRawIncludes external/LibRaw/libraw/*.h)
165	#set(LibRawSources external/LibRaw/internal/dcraw_common.cpp external/LibRaw/src/libraw_cxx.cpp external/LibRaw/internal/dcraw_fileio.cpp external/LibRaw/internal/demosaic_packs.cpp external/LibRaw/src/libraw_c_api.cpp external/LibRaw/src/libraw_datastream.cpp)	156	#set(LibRawSources external/LibRaw/internal/dcraw_common.cpp external/LibRaw/src/libraw_cxx.cpp external/LibRaw/internal/dcraw_fileio.cpp external/LibRaw/internal/demosaic_packs.cpp external/LibRaw/src/libraw_c_api.cpp external/LibRaw/src/libraw_datastream.cpp)
166		157
Lines 221-227 Link Here
221	${EXIF_LIBRARIES}	212	${EXIF_LIBRARIES}
222	${EXIV2_LIBRARIES}	213	${EXIV2_LIBRARIES}
223	${GEXIV2_LIBRARIES}	214	${GEXIV2_LIBRARIES}
224	#${LENSFUN_LIBRARIES}	215	${LENSFUN_LIBRARIES}
225	${SIGC2_LIBRARIES}	216	${SIGC2_LIBRARIES}
226	${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES}	217	${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES}
227	${PIXMAN_LIBRARIES}	218	${PIXMAN_LIBRARIES}
Lines 258-264 Link Here
258	${EXIF_LIBRARIES}	249	${EXIF_LIBRARIES}
259	${EXIV2_LIBRARIES}	250	${EXIV2_LIBRARIES}
260	${GEXIV2_LIBRARIES}	251	${GEXIV2_LIBRARIES}
261	#${LENSFUN_LIBRARIES}	252	${LENSFUN_LIBRARIES}
262	${SIGC2_LIBRARIES}	253	${SIGC2_LIBRARIES}
263	${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES}	254	${PANGO_LIBRARIES} ${PANGOFT2_LIBRARIES}
264	${GLIBMM_LIBRARIES}	255	${GLIBMM_LIBRARIES}