Skip to content

Commit 76b516c

Browse files
AntoinePrvAntoinePrv
committed
Remove obsolete header variable
1 parent 88632fd commit 76b516c

File tree

6 files changed

+30
-80
lines changed

6 files changed

+30
-80
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
# The full license is in the file LICENSE, distributed with this software. #
1010
############################################################################
1111

12-
cmake_minimum_required(VERSION 3.10)
13-
project(xsimd)
14-
option(XSIMD_REFACTORING ON)
12+
cmake_minimum_required(VERSION 3.13)
1513

16-
set(XSIMD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
14+
project(xsimd)
1715

1816
# Versioning
1917
# ==========
2018

21-
file(STRINGS "${XSIMD_INCLUDE_DIR}/xsimd/config/xsimd_config.hpp" xsimd_version_defines
19+
file(STRINGS "include/xsimd/config/xsimd_config.hpp" xsimd_version_defines
2220
REGEX "#define XSIMD_VERSION_(MAJOR|MINOR|PATCH)")
2321
foreach(ver ${xsimd_version_defines})
2422
if(ver MATCHES "#define XSIMD_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$")
@@ -32,62 +30,11 @@ message(STATUS "xsimd v${${PROJECT_NAME}_VERSION}")
3230
# Build
3331
# =====
3432

35-
set(XSIMD_HEADERS
36-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_constants.hpp
37-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_fma3_avx.hpp
38-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_fma3_avx2.hpp
39-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_fma3_sse.hpp
40-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_fma4.hpp
41-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_common.hpp
42-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_isa.hpp
43-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_neon.hpp
44-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_neon64.hpp
45-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_rvv.hpp
46-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_scalar.hpp
47-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_sse2.hpp
48-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_sse3.hpp
49-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_sse4_1.hpp
50-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_sse4_2.hpp
51-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_ssse3.hpp
52-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_vsx.hpp
53-
${XSIMD_INCLUDE_DIR}/xsimd/arch/xsimd_sve.hpp
54-
${XSIMD_INCLUDE_DIR}/xsimd/config/xsimd_arch.hpp
55-
${XSIMD_INCLUDE_DIR}/xsimd/config/xsimd_config.hpp
56-
${XSIMD_INCLUDE_DIR}/xsimd/config/xsimd_cpuid.hpp
57-
${XSIMD_INCLUDE_DIR}/xsimd/memory/xsimd_aligned_allocator.hpp
58-
${XSIMD_INCLUDE_DIR}/xsimd/memory/xsimd_alignment.hpp
59-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_all_registers.hpp
60-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_api.hpp
61-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_neon_register.hpp
62-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_neon64_register.hpp
63-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_avx2_register.hpp
64-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_avx512f_register.hpp
65-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_avx_register.hpp
66-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_batch.hpp
67-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_batch_constant.hpp
68-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_fma3_avx_register.hpp
69-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_fma3_avx2_register.hpp
70-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_fma3_sse_register.hpp
71-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_fma4_register.hpp
72-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_common_arch.hpp
73-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_register.hpp
74-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_vsx_register.hpp
75-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_rvv_register.hpp
76-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_sse2_register.hpp
77-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_sse3_register.hpp
78-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_sse4_1_register.hpp
79-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_sse4_2_register.hpp
80-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_ssse3_register.hpp
81-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_sve_register.hpp
82-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_traits.hpp
83-
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_utils.hpp
84-
${XSIMD_INCLUDE_DIR}/xsimd/xsimd.hpp
85-
)
86-
8733
add_library(xsimd INTERFACE)
34+
add_library(xsimd::xsimd ALIAS xsimd)
8835

8936
target_include_directories(xsimd INTERFACE
90-
$<BUILD_INTERFACE:${XSIMD_INCLUDE_DIR}>
37+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
9138
$<INSTALL_INTERFACE:include>)
9239

9340
OPTION(ENABLE_XTL_COMPLEX "enables support for xcomplex defined in xtl" OFF)
@@ -133,7 +80,7 @@ install(TARGETS xsimd
13380
export(EXPORT ${PROJECT_NAME}-targets
13481
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
13582

136-
install(DIRECTORY ${XSIMD_INCLUDE_DIR}/xsimd
83+
install(DIRECTORY include/xsimd
13784
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
13885

13986
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".

‎benchmark/CMakeLists.txt‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
# The full license is in the file LICENSE, distributed with this software. #
1010
############################################################################
1111

12-
cmake_minimum_required(VERSION 3.10)
12+
cmake_minimum_required(VERSION 3.13)
1313

1414
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
1515
project(xsimd-benchmark)
1616

1717
find_package(xsimd REQUIRED CONFIG)
18-
set(XSIMD_INCLUDE_DIR ${xsimd_INCLUDE_DIRS})
1918
endif ()
2019

2120
if(NOT CMAKE_BUILD_TYPE)
@@ -63,18 +62,16 @@ if(MSVC)
6362
endforeach()
6463
endif()
6564

66-
include_directories(${XSIMD_INCLUDE_DIR})
67-
68-
set(XSIMD_BENCHMARK
65+
set(XSIMD_BENCHMARK_SRC
6966
main.cpp
7067
xsimd_benchmark.hpp
7168
)
7269

73-
set(XSIMD_BENCHMARK_TARGET benchmark_xsimd)
74-
add_executable(${XSIMD_BENCHMARK_TARGET} ${XSIMD_BENCHMARK} ${XSIMD_HEADERS})
70+
add_executable(benchmark_xsimd ${XSIMD_BENCHMARK_SRC})
71+
target_link_libraries(benchmark_xsimd PRIVATE xsimd)
7572

7673
if(ENABLE_XTL_COMPLEX)
7774
target_link_libraries(benchmark_xsimd PRIVATE xtl)
7875
endif()
7976

80-
add_custom_target(xbenchmark COMMAND benchmark_xsimd DEPENDS ${XSIMD_BENCHMARK_TARGET})
77+
add_custom_target(xbenchmark COMMAND benchmark_xsimd DEPENDS benchmark_xsimd)

‎examples/CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
# The full license is in the file LICENSE, distributed with this software. #
1010
############################################################################
1111

12-
cmake_minimum_required(VERSION 3.10)
12+
cmake_minimum_required(VERSION 3.13)
13+
1314
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
1415
project(xsimd-examples)
1516

1617
find_package(xsimd REQUIRED CONFIG)
17-
set(XSIMD_INCLUDE_DIR ${xsimd_INCLUDE_DIR})
1818
endif ()
1919

20-
include_directories(${XSIMD_INCLUDE_DIR})
21-
2220
if(NOT CMAKE_BUILD_TYPE)
2321
message(STATUS "Setting examples build type to Release")
2422
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
@@ -35,7 +33,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
3533
endif()
3634
endif()
3735

38-
add_executable(mandelbrot mandelbrot.cpp ${XSIMD_HEADERS})
36+
add_executable(mandelbrot mandelbrot.cpp)
37+
target_link_libraries(mandelbrot PRIVATE xsimd)
3938
set_property(TARGET mandelbrot PROPERTY CXX_STANDARD 14)
4039
if(ENABLE_XTL_COMPLEX)
4140
target_link_libraries(mandelbrot PRIVATE xtl)

‎test/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
# The full license is in the file LICENSE, distributed with this software. #
1010
############################################################################
1111

12-
cmake_minimum_required(VERSION 3.10)
12+
cmake_minimum_required(VERSION 3.13)
1313

1414
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
1515
project(xsimd-test)
1616

1717
enable_testing()
1818

1919
find_package(xsimd REQUIRED CONFIG)
20-
set(XSIMD_INCLUDE_DIR ${xsimd_INCLUDE_DIRS})
2120
endif ()
2221

2322
if(NOT CMAKE_BUILD_TYPE)
@@ -174,8 +173,8 @@ if(NOT MSVC)
174173
list(APPEND XSIMD_TESTS test_gnu_source.cpp)
175174
endif()
176175

177-
add_executable(test_xsimd ${XSIMD_TESTS} ${XSIMD_HEADERS})
178-
target_include_directories(test_xsimd PRIVATE ${XSIMD_INCLUDE_DIR})
176+
add_executable(test_xsimd ${XSIMD_TESTS})
177+
target_link_libraries(test_xsimd PRIVATE xsimd)
179178

180179
option(DOWNLOAD_DOCTEST OFF)
181180
find_package(doctest QUIET)

‎test/architectures/CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ set(INTEL_PROCESSORS
33
icelake-server cascadelake cooperlake tigerlake sapphirerapids alderlake
44
rocketlake graniterapids graniterapids-d znver4)
55

6+
if(NOT TARGET xsimd)
7+
find_package(xsimd REQUIRED CONFIG)
8+
endif()
9+
610
foreach(INTEL_PROCESSOR ${INTEL_PROCESSORS})
711
# Adding the werror here to choke if the -march is incompatible with the
812
# native one.
@@ -11,7 +15,7 @@ foreach(INTEL_PROCESSOR ${INTEL_PROCESSORS})
1115
message(STATUS ${INTEL_PROCESSOR})
1216
add_library(test_${INTEL_PROCESSOR} OBJECT dummy.cpp)
1317
target_compile_options(test_${INTEL_PROCESSOR} PRIVATE -march=${INTEL_PROCESSOR})
14-
target_include_directories(test_${INTEL_PROCESSOR} PRIVATE ${XSIMD_INCLUDE_DIR})
18+
target_link_libraries(test_${INTEL_PROCESSOR} PRIVATE xsimd)
1519
add_dependencies(xtest test_${INTEL_PROCESSOR})
1620
if(ENABLE_XTL_COMPLEX)
1721
target_compile_features(test_${INTEL_PROCESSOR} PRIVATE cxx_std_14)

‎test/doc/CMakeLists.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT CMAKE_OSX_ARCHITECTURES)
55

6+
if(NOT TARGET xsimd)
7+
find_package(xsimd REQUIRED CONFIG)
8+
endif()
9+
610
if(ENABLE_XTL_COMPLEX)
711
add_compile_definitions(XSIMD_ENABLE_XTL_COMPLEX=1)
812
include_directories(${xtl_INCLUDE_DIRS})
@@ -16,19 +20,19 @@ add_library(test_doc_any_arch OBJECT
1620
manipulating_abstract_batches.cpp
1721
manipulating_parametric_batches.cpp
1822
writing_vectorized_code.cpp)
19-
target_include_directories(test_doc_any_arch PRIVATE ${XSIMD_INCLUDE_DIR})
23+
target_link_libraries(test_doc_any_arch PRIVATE xsimd)
2024
target_compile_options(test_doc_any_arch PRIVATE -mavx)
2125

2226
add_library(test_doc_avx2 OBJECT
2327
explicit_use_of_an_instruction_set.cpp
2428
sum_avx2.cpp)
29+
target_link_libraries(test_doc_avx2 PRIVATE xsimd)
2530
target_compile_options(test_doc_avx2 PRIVATE -mavx2)
26-
target_include_directories(test_doc_avx2 PRIVATE ${XSIMD_INCLUDE_DIR})
2731

2832
add_library(test_doc_sse2 OBJECT
2933
sum_sse2.cpp)
34+
target_link_libraries(test_doc_sse2 PRIVATE xsimd)
3035
target_compile_options(test_doc_sse2 PRIVATE -msse2)
31-
target_include_directories(test_doc_sse2 PRIVATE ${XSIMD_INCLUDE_DIR})
3236

3337
add_dependencies(xtest test_doc_any_arch test_doc_avx2 test_doc_sse2)
3438

0 commit comments

Comments
 (0)