1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
--- a/CMakeLists.txt 2014-06-22 23:44:17.666047736 +0200
+++ b/CMakeLists.txt 2014-06-22 23:45:13.656347758 +0200
@@ -41,7 +41,7 @@
# detect top level projects
-FIND_PACKAGE( Yajl )
+FIND_PACKAGE( Yajl REQUIRED )
IF( HAVE_YAJL )
INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} )
@@ -51,72 +51,16 @@
IF( NOT HAVE_YAJL_VERSION_H )
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ )
ENDIF( NOT HAVE_YAJL_VERSION_H )
-ELSE( HAVE_YAJL )
- IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
- include(ExternalProject)
- ExternalProject_Add( yajl
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl
- CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl
- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl
- BUILD_COMMAND ${MAKE}
- # skip installation
- INSTALL_COMMAND echo )
- INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl )
- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl )
- SET( YAJL_LIBRARIES yajl-static )
- ENDIF()
-
ENDIF( HAVE_YAJL )
-FIND_PACKAGE( Elektra )
+FIND_PACKAGE( Elektra REQUIRED )
+SET( HAVE_ELEKTRA 1 )
IF(HAVE_ELEKTRA)
SET( ELEKTRA_SPEC "Requires: elektra
BuildRequires: elektra-devel" )
INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} )
STRING(REPLACE ";" " " ELEKTRA_PC_LDFLAGS "${ELEKTRA_STATIC_LDFLAGS}")
-ELSE(HAVE_ELEKTRA)
- SET( ELEKTRA_VERSION elektra-0.7.1 )
- MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" )
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include )
- SET( ELEKTRA_LIBRARIES_STATIC
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o
- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o
- )
- SET( ELEKTRA_LIBRARIES
- ${LIBXML2_LIBRARIES}
- )
- IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
- include(ExternalProject)
- ExternalProject_Add( ${ELEKTRA_VERSION}
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}
- # GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors
- CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false
- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION}
- BUILD_COMMAND ${MAKE}
- # skip installation
- INSTALL_COMMAND echo )
- ENDIF()
ENDIF(HAVE_ELEKTRA)
#now add all directories
--- a/src/CMakeLists.txt 2013-12-20 00:04:12.319880917 +0100
+++ b/src/CMakeLists.txt 2013-12-20 00:11:33.504365352 +0100
@@ -100,7 +100,9 @@
INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} )
-FIND_PACKAGE( X11 )
+IF(WANT_X11)
+FIND_PACKAGE( X11 REQUIRED )
+ENDIF(WANT_X11)
IF(X11_FOUND)
INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} )
@@ -123,27 +125,36 @@
LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} )
ENDIF(X11_FOUND)
-FIND_PACKAGE( CUPS )
+IF(WANT_CUPS)
+FIND_PACKAGE( Cups REQUIRED )
+SET( HAVE_CUPS 1 )
+ENDIF(WANT_CUPS)
IF(HAVE_CUPS)
INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} )
LINK_DIRECTORIES( ${CUPS_LIBRARYS} )
ENDIF(HAVE_CUPS)
-FIND_PACKAGE( Cairo )
+IF(WANT_CAIRO)
+FIND_PACKAGE( Cairo REQUIRED)
+ENDIF(WANT_CAIRO)
IF(HAVE_CAIRO)
INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo )
INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} )
LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} )
ENDIF(HAVE_CAIRO)
-FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui)
+IF(WANT_QT4)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
+ENDIF(WANT_QT4)
IF(QT_FOUND)
SET( HAVE_QT 1 )
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} )
ENDIF(QT_FOUND)
-FIND_PACKAGE( Fltk )
+IF(WANT_FLTK)
+FIND_PACKAGE( FLTK REQUIRED)
+ENDIF(WANT_FLTK)
IF(FLTK_FOUND)
SET( HAVE_FLTK 1 )
INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
@@ -159,7 +170,9 @@
SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE)
ENDIF(LIBXML2_FOUND)
-FIND_PACKAGE( LibRaw )
+IF(WANT_LIBRAW)
+FIND_PACKAGE( LibRaw REQUIRED )
+ENDIF(WANT_LIBRAW)
IF( HAVE_LIBRAW )
# TRY_COMPILE(
# HAVE_LIBRAW_REALLY
@@ -182,7 +195,9 @@
MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" )
ENDIF()
-FIND_PACKAGE( Exif2 )
+IF(WANT_EXIV2)
+FIND_PACKAGE( Exif2 REQUIRED )
+ENDIF(WANT_EXIV2)
IF(HAVE_EXIV2)
INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} )
--- a/doc/CMakeLists.txt 2014-03-07 09:43:25.000000000 +0100
+++ b/doc/CMakeLists.txt 2014-06-23 00:22:01.256748956 +0200
@@ -33,7 +33,9 @@
INSTALL( FILES ${MAN1_PAGES} DESTINATION share/man/man1 )
INSTALL( FILES ${MAN3_PAGES} DESTINATION share/man/man3 )
-FIND_PACKAGE( Doxygen )
+IF(WANT_HTML)
+ FIND_PACKAGE( Doxygen REQUIRED )
+ENDIF(WANT_HTML)
IF( DOXYGEN_FOUND )
ADD_CUSTOM_COMMAND( OUTPUT html
@@ -43,5 +45,5 @@
ADD_CUSTOM_TARGET( docu ALL
DEPENDS html )
- INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME} )
+ INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME}-${OYRANOS_VERSION} )
ENDIF()
|
GitWeb