Skip to content

Commit c50d7f6

Browse files
tck42tck42
committed
Fix cmake configuration
1 parent 1596802 commit c50d7f6

File tree

3 files changed

+9
-168
lines changed

3 files changed

+9
-168
lines changed

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
cmake_minimum_required(VERSION 2.8.0)
88
project(libsimdpp)
9-
set(PROJECT_VERSION "1.0")
9+
set(PROJECT_VERSION "2.0-rc2")
1010
set(SIMDPP_API_VERSION "1.0")
1111

1212
set(PKG_NAME "${CMAKE_PROJECT_NAME}")
@@ -34,15 +34,15 @@ simdpp_get_compilable_archs(COMPILABLE_ARCHS)
3434

3535
set(SIMDPP_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/${PKG_NAME}-${SIMDPP_API_VERSION}")
3636
set(SIMDPP_DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PKG_NAME}")
37-
set(SIMDPP_PKGCONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/${PKG_FULL_NAME}")
37+
set(SIMDPP_PKGCONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
3838

3939
configure_file(
4040
"${CMAKE_CURRENT_SOURCE_DIR}/libsimdpp.pc.in"
41-
"${CMAKE_CURRENT_BINARY_DIR}/${PKF_FULL_NAME}.pc" @ONLY
41+
"${CMAKE_CURRENT_BINARY_DIR}/${PKG_NAME}-${SIMDPP_API_VERSION}.pc" @ONLY
4242
)
4343

4444
install(FILES
45-
"${CMAKE_CURRENT_BINARY_DIR}/${PKF_FULL_NAME}.pc"
45+
"${CMAKE_CURRENT_BINARY_DIR}/${PKG_NAME}-${SIMDPP_API_VERSION}.pc"
4646
DESTINATION "${SIMDPP_PKGCONFIGDIR}"
4747
)
4848

‎libsimdpp.pc.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
prefix=@prefix@
1+
prefix=@CMAKE_INSTALL_PREFIX@
22
exec_prefix=@exec_prefix@
33
libdir=@libdir@
4-
includedir=@includedir@
4+
includedir=@SIMDPP_INCLUDEDIR@
55

66
Name: libsimdpp
77
Description: Simdpp SIMD libraries
88
Requires:
9-
Version: @PACKAGE_VERSION@
9+
Version: @PROJECT_VERSION@
1010
Libs:
11-
Cflags: -I${includedir}/libsimdpp
11+
Cflags: -I${includedir}
1212

‎simdpp/CMakeLists.txt

+1-160
Original file line numberDiff line numberDiff line change
@@ -4,166 +4,7 @@
44
# (See accompanying file LICENSE_1_0.txt or copy at
55
# http://www.boost.org/LICENSE_1_0.txt)
66

7-
set(HEADERS
8-
adv/detail/transpose.h
9-
adv/transpose.h
10-
altivec/load1.h
11-
core/align.h
12-
core/bit_and.h
13-
core/bit_andnot.h
14-
core/bit_not.h
15-
core/bit_or.h
16-
core/bit_xor.h
17-
core/blend.h
18-
core/broadcast.h
19-
core/splat.h
20-
core/cache.h
21-
core/cast.h
22-
core/cmp_eq.h
23-
core/cmp_ge.h
24-
core/cmp_gt.h
25-
core/cmp_le.h
26-
core/cmp_lt.h
27-
core/cmp_neq.h
28-
core/detail/cast.h
29-
core/detail/cast.inl
30-
core/detail/i_shift.h
31-
core/detail/mem_pack.h
32-
core/detail/mem_unpack.h
33-
core/detail/move_signed.h
34-
core/detail/shuffle128.h
35-
core/detail/shuffle_emul.h
36-
core/extract.h
37-
core/f_abs.h
38-
core/f_add.h
39-
core/f_ceil.h
40-
core/f_div.h
41-
core/f_floor.h
42-
core/f_fmadd.h
43-
core/f_fmsub.h
44-
core/f_isnan.h
45-
core/f_isnan2.h
46-
core/f_max.h
47-
core/f_min.h
48-
core/f_mul.h
49-
core/f_neg.h
50-
core/f_rcp_e.h
51-
core/f_rcp_rh.h
52-
core/f_rsqrt_e.h
53-
core/f_rsqrt_rh.h
54-
core/f_sign.h
55-
core/f_sqrt.h
56-
core/f_sub.h
57-
core/f_trunc.h
58-
core/i_abs.h
59-
core/i_add.h
60-
core/i_adds.h
61-
core/i_avg.h
62-
core/i_avg_trunc.h
63-
core/i_div_p.h
64-
core/i_max.h
65-
core/i_min.h
66-
core/i_mul.h
67-
core/i_mull.h
68-
core/i_neg.h
69-
core/i_shift_l.h
70-
core/i_shift_r.h
71-
core/i_sub.h
72-
core/i_subs.h
73-
core/insert.h
74-
core/load.h
75-
core/load_packed2.h
76-
core/load_packed3.h
77-
core/load_packed4.h
78-
core/load_u.h
79-
core/make_shuffle_bytes_mask.h
80-
core/move_l.h
81-
core/move_r.h
82-
core/permute2.h
83-
core/permute4.h
84-
core/permute_bytes16.h
85-
core/permute_zbytes16.h
86-
core/shuffle1.h
87-
core/shuffle2.h
88-
core/shuffle_bytes16.h
89-
core/shuffle_zbytes16.h
90-
core/store.h
91-
core/store_first.h
92-
core/store_last.h
93-
core/store_packed2.h
94-
core/store_packed3.h
95-
core/store_packed4.h
96-
core/store_u.h
97-
core/stream.h
98-
core/to_float32.h
99-
core/to_float64.h
100-
core/to_int16.h
101-
core/to_int32.h
102-
core/to_int64.h
103-
core/to_int8.h
104-
core/unzip_hi.h
105-
core/unzip_lo.h
106-
core/zip_hi.h
107-
core/zip_lo.h
108-
detail/align.h
109-
detail/mem_block.h
110-
detail/not_implemented.h
111-
detail/width.h
112-
detail/word_size.h
113-
dispatch/arch.h
114-
dispatch/dispatcher.h
115-
dispatch/get_arch_gcc_builtin_cpu_supports.h
116-
dispatch/get_arch_linux_cpuinfo.h
117-
dispatch/macros.h
118-
neon/detail/shuffle.h
119-
neon/detail/shuffle_int16x8.h
120-
neon/detail/shuffle_int32x4.h
121-
neon/detail/shuffle_int64x2.h
122-
neon/math_int.h
123-
neon/memory_store.h
124-
neon/shuffle.h
125-
null/bitwise.h
126-
null/compare.h
127-
null/foreach.h
128-
null/mask.h
129-
null/math.h
130-
null/memory.h
131-
null/set.h
132-
null/shuffle.h
133-
null/transpose.h
134-
setup_arch.h
135-
simd.h
136-
sse/cache.h
137-
sse/compare.h
138-
sse/convert.h
139-
sse/extract_half.h
140-
sse/math_int.h
141-
sse/memory_load.h
142-
sse/memory_store.h
143-
sse/shuffle.h
144-
this_compile_arch.h
145-
types.h
146-
types/float32.h
147-
types/float32x4.h
148-
types/float32x8.h
149-
types/float64.h
150-
types/float64x2.h
151-
types/float64x4.h
152-
types/fwd.h
153-
types/int16.h
154-
types/int16x16.h
155-
types/int16x8.h
156-
types/int32.h
157-
types/int32x4.h
158-
types/int32x8.h
159-
types/int64.h
160-
types/int64x2.h
161-
types/int64x4.h
162-
types/int8.h
163-
types/int8x16.h
164-
types/int8x32.h
165-
types/traits.h
166-
)
7+
file(GLOB_RECURSE HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h *.inl)
1678

1689
foreach(FILE ${HEADERS})
16910
get_filename_component(FILE_PATH "${FILE}" PATH)

0 commit comments

Comments
 (0)