Skip to content

Commit

Permalink
Make testing optional in 2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
SylvainCorlay committed Jan 16, 2017
1 parent eea70d4 commit 6d90f28
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
22 changes: 21 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,25 @@ message(STATUS "xsimd v${${PROJECT_NAME}_VERSION}")
# Build
# =====

OPTION(BUILD_TESTS "xsimd test suite" ON)

set(XSIMD_HEADERS
${XSIMD_INCLUDE_DIR}/xsimd/xsimd.hpp
${XSIMD_INCLUDE_DIR}/xsimd/xsimd_config.hpp
)

set(XSIMD_CONFIG_HEADERS
${XSIMD_INCLUDE_DIR}/xsimd/config/xplatform_config.hpp
${XSIMD_INCLUDE_DIR}/xsimd/config/xsimd_include.hpp
${XSIMD_INCLUDE_DIR}/xsimd/config/xsimd_config.hpp
)

set(XSIMD_MEMORY_HEADERS
${XSIMD_INCLUDE_DIR}/xsimd/memory/xaligned_allocator.hpp
${XSIMD_INCLUDE_DIR}/xsimd/memory/xaligned_stack_buffer.hpp
)

set(XSIMD_TYPES_HEADERS
${XSIMD_INCLUDE_DIR}/xsimd/types/xavx_double.hpp
${XSIMD_INCLUDE_DIR}/xsimd/types/xavx_float.hpp
${XSIMD_INCLUDE_DIR}/xsimd/types/xsse_double.hpp
Expand All @@ -45,7 +56,9 @@ set(XSIMD_HEADERS
${XSIMD_INCLUDE_DIR}/xsimd/types/xsimd_traits.hpp
)

add_subdirectory(test)
if(BUILD_TESTS)
add_subdirectory(test)
endif()

# Installation
# ============
Expand All @@ -55,6 +68,13 @@ include(CMakePackageConfigHelpers)

install(FILES ${XSIMD_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xsimd)
install(FILES ${XSIMD_CONFIG_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xsimd/config)
install(FILES ${XSIMD_MEMORY_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xsimd/memory)
install(FILES ${XSIMD_TYPES_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xsimd/types)


# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
set(XSIMD_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for xsimdConfig.cmake")
Expand Down
2 changes: 1 addition & 1 deletion include/xsimd/xsimd_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@

#define XSIMD_VERSION_MAJOR 2
#define XSIMD_VERSION_MINOR 0
#define XSIMD_VERSION_PATCH 0
#define XSIMD_VERSION_PATCH 1
#endif

0 comments on commit 6d90f28

Please sign in to comment.