Line
Link Here
|
0 |
-- oyranos-0.9.5/src/CMakeLists.txt |
0 |
++ oyranos-0.9.5/src/CMakeLists.txt |
Lines 100-106
Link Here
|
100 |
INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} ) |
100 |
INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} ) |
101 |
LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} ) |
101 |
LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} ) |
102 |
|
102 |
|
103 |
FIND_PACKAGE( X11 ) |
103 |
IF(WANT_X11) |
|
|
104 |
FIND_PACKAGE( X11 REQUIRED ) |
105 |
ENDIF(WANT_X11) |
104 |
IF(X11_FOUND) |
106 |
IF(X11_FOUND) |
105 |
INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} ) |
107 |
INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} ) |
106 |
LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} ) |
108 |
LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} ) |
Lines 123-149
Link Here
|
123 |
LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} ) |
125 |
LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} ) |
124 |
ENDIF(X11_FOUND) |
126 |
ENDIF(X11_FOUND) |
125 |
|
127 |
|
126 |
FIND_PACKAGE( CUPS ) |
128 |
IF(WANT_CUPS) |
|
|
129 |
FIND_PACKAGE( Cups REQUIRED ) |
130 |
SET( HAVE_CUPS 1 ) |
131 |
ENDIF(WANT_CUPS) |
127 |
IF(HAVE_CUPS) |
132 |
IF(HAVE_CUPS) |
128 |
INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} ) |
133 |
INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} ) |
129 |
LINK_DIRECTORIES( ${CUPS_LIBRARYS} ) |
134 |
LINK_DIRECTORIES( ${CUPS_LIBRARYS} ) |
130 |
ENDIF(HAVE_CUPS) |
135 |
ENDIF(HAVE_CUPS) |
131 |
|
136 |
|
132 |
FIND_PACKAGE( Cairo ) |
137 |
IF(WANT_CAIRO) |
|
|
138 |
FIND_PACKAGE( Cairo REQUIRED) |
139 |
ENDIF(WANT_CAIRO) |
133 |
IF(HAVE_CAIRO) |
140 |
IF(HAVE_CAIRO) |
134 |
INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo ) |
141 |
INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo ) |
135 |
INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} ) |
142 |
INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} ) |
136 |
LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} ) |
143 |
LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} ) |
137 |
ENDIF(HAVE_CAIRO) |
144 |
ENDIF(HAVE_CAIRO) |
138 |
|
145 |
|
139 |
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui) |
146 |
IF(WANT_QT4) |
|
|
147 |
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED) |
148 |
ENDIF(WANT_QT4) |
140 |
IF(QT_FOUND) |
149 |
IF(QT_FOUND) |
141 |
SET( HAVE_QT 1 ) |
150 |
SET( HAVE_QT 1 ) |
142 |
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} ) |
151 |
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} ) |
143 |
LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} ) |
152 |
LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} ) |
144 |
ENDIF(QT_FOUND) |
153 |
ENDIF(QT_FOUND) |
145 |
|
154 |
|
146 |
FIND_PACKAGE( Fltk ) |
155 |
IF(WANT_FLTK) |
|
|
156 |
FIND_PACKAGE( FLTK REQUIRED) |
157 |
ENDIF(WANT_FLTK) |
147 |
IF(FLTK_FOUND) |
158 |
IF(FLTK_FOUND) |
148 |
SET( HAVE_FLTK 1 ) |
159 |
SET( HAVE_FLTK 1 ) |
149 |
INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} ) |
160 |
INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} ) |
Lines 159-165
Link Here
|
159 |
SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE) |
170 |
SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE) |
160 |
ENDIF(LIBXML2_FOUND) |
171 |
ENDIF(LIBXML2_FOUND) |
161 |
|
172 |
|
162 |
FIND_PACKAGE( LibRaw ) |
173 |
IF(WANT_LIBRAW) |
|
|
174 |
FIND_PACKAGE( LibRaw REQUIRED ) |
175 |
ENDIF(WANT_LIBRAW) |
163 |
IF( HAVE_LIBRAW ) |
176 |
IF( HAVE_LIBRAW ) |
164 |
# TRY_COMPILE( |
177 |
# TRY_COMPILE( |
165 |
# HAVE_LIBRAW_REALLY |
178 |
# HAVE_LIBRAW_REALLY |
Lines 182-188
Link Here
|
182 |
MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" ) |
195 |
MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" ) |
183 |
ENDIF() |
196 |
ENDIF() |
184 |
|
197 |
|
185 |
FIND_PACKAGE( Exif2 ) |
198 |
IF(WANT_EXIV2) |
|
|
199 |
FIND_PACKAGE( Exif2 REQUIRED ) |
200 |
ENDIF(WANT_EXIV2) |
186 |
IF(HAVE_EXIV2) |
201 |
IF(HAVE_EXIV2) |
187 |
INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} ) |
202 |
INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} ) |
188 |
LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} ) |
203 |
LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} ) |
189 |
-- oyranos-0.9.5/CMakeLists.txt |
204 |
++ oyranos-0.9.5/CMakeLists.txt |
Lines 41-47
Link Here
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
# detect top level projects |
43 |
# detect top level projects |
44 |
FIND_PACKAGE( Yajl ) |
44 |
FIND_PACKAGE( Yajl REQUIRED ) |
45 |
IF( HAVE_YAJL ) |
45 |
IF( HAVE_YAJL ) |
46 |
INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} ) |
46 |
INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} ) |
47 |
LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} ) |
47 |
LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} ) |
Lines 51-121
Link Here
|
51 |
IF( NOT HAVE_YAJL_VERSION_H ) |
51 |
IF( NOT HAVE_YAJL_VERSION_H ) |
52 |
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ ) |
52 |
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ ) |
53 |
ENDIF( NOT HAVE_YAJL_VERSION_H ) |
53 |
ENDIF( NOT HAVE_YAJL_VERSION_H ) |
54 |
ELSE( HAVE_YAJL ) |
|
|
55 |
IF(CMAKE_VERSION VERSION_GREATER 2.8.0) |
56 |
include(ExternalProject) |
57 |
ExternalProject_Add( yajl |
58 |
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl |
59 |
CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl |
60 |
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl |
61 |
BUILD_COMMAND ${MAKE} |
62 |
# skip installation |
63 |
INSTALL_COMMAND echo ) |
64 |
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl ) |
65 |
LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl ) |
66 |
SET( YAJL_LIBRARIES yajl-static ) |
67 |
ENDIF() |
68 |
|
69 |
ENDIF( HAVE_YAJL ) |
54 |
ENDIF( HAVE_YAJL ) |
70 |
|
55 |
|
71 |
FIND_PACKAGE( Elektra ) |
56 |
FIND_PACKAGE( Elektra REQUIRED ) |
|
|
57 |
SET( HAVE_ELEKTRA 1 ) |
72 |
IF(HAVE_ELEKTRA) |
58 |
IF(HAVE_ELEKTRA) |
73 |
SET( ELEKTRA_SPEC "Requires: elektra 0.7 |
59 |
SET( ELEKTRA_SPEC "Requires: elektra 0.7 |
74 |
BuildRequires: elektra-devel" ) |
60 |
BuildRequires: elektra-devel" ) |
75 |
INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} ) |
61 |
INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} ) |
76 |
LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} ) |
62 |
LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} ) |
77 |
ELSE(HAVE_ELEKTRA) |
|
|
78 |
SET( ELEKTRA_VERSION elektra-0.7.1 ) |
79 |
MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" ) |
80 |
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include |
81 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include ) |
82 |
SET( ELEKTRA_LIBRARIES_STATIC |
83 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o |
84 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o |
85 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o |
86 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o |
87 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o |
88 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o |
89 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o |
90 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o |
91 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o |
92 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o |
93 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o |
94 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o |
95 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o |
96 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o |
97 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o |
98 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o |
99 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o |
100 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o |
101 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o |
102 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o |
103 |
${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o |
104 |
) |
105 |
SET( ELEKTRA_LIBRARIES |
106 |
${LIBXML2_LIBRARIES} |
107 |
) |
108 |
IF(CMAKE_VERSION VERSION_GREATER 2.8.0) |
109 |
include(ExternalProject) |
110 |
ExternalProject_Add( ${ELEKTRA_VERSION} |
111 |
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION} |
112 |
# GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors |
113 |
CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false |
114 |
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION} |
115 |
BUILD_COMMAND ${MAKE} |
116 |
# skip installation |
117 |
INSTALL_COMMAND echo ) |
118 |
ENDIF() |
119 |
ENDIF(HAVE_ELEKTRA) |
63 |
ENDIF(HAVE_ELEKTRA) |
120 |
|
64 |
|
121 |
#now add all directories |
65 |
#now add all directories |