1 |
jlec 13/12/06 12:25:05 |
2 |
|
3 |
Added: cbflib-0.9.3.3-unbundle.patch |
4 |
Log: |
5 |
sci-libs/cbflib: Version BUmp |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: cbflib-0.9.3.3-unbundle.patch |
16 |
=================================================================== |
17 |
CMakeLists.txt | 118 +++------------------------------------------------------ |
18 |
1 file changed, 6 insertions(+), 112 deletions(-) |
19 |
|
20 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
21 |
index 75054d6..15bab99 100644 |
22 |
--- a/CMakeLists.txt |
23 |
+++ b/CMakeLists.txt |
24 |
@@ -279,7 +279,7 @@ project (CBFlib C CXX Fortran) |
25 |
enable_testing() |
26 |
set (CBF_CMAKE_DEBUG "ON") |
27 |
|
28 |
-set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing") |
29 |
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing") |
30 |
|
31 |
# |
32 |
# User setable parameters |
33 |
@@ -530,42 +530,6 @@ find_package(ZLIB) |
34 |
|
35 |
|
36 |
|
37 |
-#Load external packages in build directory at cmake time |
38 |
-add_subdirectory(${CBF__EXTERNAL_PACKAGES} "${CBF__EXT_PKG}") |
39 |
- |
40 |
-find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}") |
41 |
-if (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND") |
42 |
- file(WRITE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running" "cbf_ext_pkg_build_running") |
43 |
- CBF_DEBUG_MESSAGE("CMAKE_COMMAND: ${CMAKE_COMMAND}") |
44 |
- CBF_DEBUG_MESSAGE("CBFlib_SOURCE_DIR: ${CBFlib_SOURCE_DIR} ") |
45 |
- execute_process( |
46 |
- COMMAND ${CMAKE_COMMAND} ${CBFlib_SOURCE_DIR} |
47 |
- RESULT_VARIABLE CBF_BUILD_RESULT) |
48 |
- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}") |
49 |
- execute_process( |
50 |
- COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target HDF5 |
51 |
- RESULT_VARIABLE CBF_BUILD_RESULT) |
52 |
- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}") |
53 |
- execute_process( |
54 |
- COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target TIFF |
55 |
- RESULT_VARIABLE CBF_BUILD_RESULT) |
56 |
- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}") |
57 |
- file(REMOVE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running") |
58 |
-endif (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND") |
59 |
- |
60 |
- |
61 |
-file(GLOB CBF_HDF5_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*hdf5*") |
62 |
-CBF_DEBUG_MESSAGE( "CBF_HDF5_LIBRARY_PATH: ${CBF_HDF5_LIBRARY_PATH}") |
63 |
-file(GLOB CBF_TIFF_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*tif*") |
64 |
-CBF_DEBUG_MESSAGE( "CBF_TIFF_LIBRARY_PATH: ${CBF_TIFF_LIBRARY_PATH}") |
65 |
- |
66 |
-if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||") |
67 |
- MESSAGE(STATUS "Must build external packages in ${CBF__EXT_PKG}") |
68 |
- MESSAGE(STATUS "Then rerun cmake") |
69 |
- MESSAGE(WARNING "Finishing run to make Makefiles") |
70 |
-endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||") |
71 |
- |
72 |
- |
73 |
# |
74 |
# Data Directories |
75 |
# |
76 |
@@ -579,35 +543,6 @@ set(CBF_DATAURLBASE "http://downloads.sf.net/cbflib") |
77 |
set(CBF_DATAURLI "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Input.tar.gz") |
78 |
set(CBF_DATAURLO "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output.tar.gz") |
79 |
set(CBF_DATAURLS "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output_Sigs_Only.tar.gz") |
80 |
-# |
81 |
-# Load and unpack the Data Files |
82 |
-# |
83 |
-CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRI} ${CBF_DATAURLI}) |
84 |
-CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRO} ${CBF_DATAURLO}) |
85 |
-CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRS} ${CBF_DATAURLS}) |
86 |
-# |
87 |
-# Verify the checksums |
88 |
-# |
89 |
-file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*") |
90 |
-file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*") |
91 |
-foreach(loop_file ${CBF_DATADIRI_FILES} ) |
92 |
- if (NOT "${loop_file}" MATCHES "[*.]md5") |
93 |
- file(MD5 "${loop_file}" loop_file_md5) |
94 |
- file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1) |
95 |
- if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
96 |
- message(WARNINH "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|") |
97 |
- endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
98 |
- endif (NOT "${loop_file}" MATCHES "[*.]md5") |
99 |
-endforeach(loop_file) |
100 |
-foreach(loop_file ${CBF_DATADIRO_FILES} ) |
101 |
- if (NOT "${loop_file}" MATCHES "[*.]md5") |
102 |
- file(MD5 "${loop_file}" loop_file_md5) |
103 |
- file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1) |
104 |
- if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
105 |
- message(WARNING "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|") |
106 |
- endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
107 |
- endif (NOT "${loop_file}" MATCHES "[*.]md5") |
108 |
-endforeach(loop_file) |
109 |
|
110 |
|
111 |
# |
112 |
@@ -775,7 +710,7 @@ add_library(cbf_shared SHARED ${CBF_C_SOURCES}) |
113 |
set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf") |
114 |
set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C) |
115 |
set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}") |
116 |
-target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH}) |
117 |
+target_link_libraries(cbf_shared hdf5) |
118 |
|
119 |
# |
120 |
# Build the static and shared IMG libraries |
121 |
@@ -791,7 +726,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib") |
122 |
add_library(img_shared SHARED ${CBF__EXAMPLES}/img.c) |
123 |
set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img") |
124 |
set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C) |
125 |
-target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH}) |
126 |
+target_link_libraries(img_shared hdf5 m ) |
127 |
|
128 |
|
129 |
# |
130 |
@@ -829,26 +764,6 @@ target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH}) |
131 |
# |
132 |
# C and C++ examples |
133 |
# |
134 |
-CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static") |
135 |
-CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "") |
136 |
-CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static") |
137 |
-CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "") |
138 |
-CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "") |
139 |
-CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "") |
140 |
-CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "") |
141 |
-CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static") |
142 |
-CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "") |
143 |
-CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "") |
144 |
-CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "") |
145 |
-CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF__DECTRIS_EXAMPLES}" "" "") |
146 |
-CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "") |
147 |
-CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "") |
148 |
-CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "") |
149 |
-CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}") |
150 |
-CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "") |
151 |
-CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "") |
152 |
-CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "") |
153 |
-CBF_ADD_C_EXAMPLE(testalloc "${CBF__EXAMPLES}" "" "") |
154 |
|
155 |
|
156 |
|
157 |
@@ -876,26 +791,9 @@ target_link_libraries(test_xds_binary fcb_static) |
158 |
# |
159 |
# install |
160 |
# |
161 |
-install (TARGETS makecbf DESTINATION bin) |
162 |
-install (TARGETS img2cif DESTINATION bin) |
163 |
-install (TARGETS cif2cbf DESTINATION bin) |
164 |
-install (TARGETS adscimg2cbf DESTINATION bin) |
165 |
-install (TARGETS cbf2adscimg DESTINATION bin) |
166 |
-install (TARGETS changtestcompression DESTINATION bin) |
167 |
-install (TARGETS convert_image DESTINATION bin) |
168 |
-install (TARGETS convert_minicbf DESTINATION bin) |
169 |
-install (TARGETS minicbf2nexus DESTINATION bin) |
170 |
-install (TARGETS cbf_template_t DESTINATION bin) |
171 |
-install (TARGETS testcell DESTINATION bin) |
172 |
-install (TARGETS sauter_test DESTINATION bin) |
173 |
-install (TARGETS sequence_match DESTINATION bin) |
174 |
-install (TARGETS tiff2cbf DESTINATION bin) |
175 |
-install (TARGETS cbf_static DESTINATION lib) |
176 |
-install (TARGETS cbf_shared DESTINATION lib) |
177 |
-install (TARGETS fcb_static DESTINATION lib) |
178 |
-install (TARGETS fcb_shared DESTINATION lib) |
179 |
-install (TARGETS img_static DESTINATION lib) |
180 |
-install (TARGETS img_shared DESTINATION lib) |
181 |
+install (TARGETS cbf_shared DESTINATION lib${LIB_SUFFIX}) |
182 |
+install (TARGETS fcb_shared DESTINATION lib${LIB_SUFFIX}) |
183 |
+install (TARGETS img_shared DESTINATION lib${LIB_SUFFIX}) |
184 |
install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h") |
185 |
install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h") |
186 |
|
187 |
@@ -914,10 +812,6 @@ endif () |
188 |
# |
189 |
# tests -- to be extended |
190 |
# |
191 |
-add_test(NAME cbftest_makecbf |
192 |
- COMMAND ${CMAKE_COMMAND} |
193 |
- -DCMD1=$<TARGET_FILE:makecbf> -DARG11=${CBF_DATADIRI}/example.mar2300 -DARG12=makecbf.cbf |
194 |
- -P ${CMAKE_CURRENT_SOURCE_DIR}/runcommands.cmake) |
195 |
add_test(cbftest_testalloc ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testalloc) |
196 |
add_test(cbftest_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5) |
197 |
add_test(cbftest_testtree ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testtree) |