Merge pull request #3 from lpinca/fix/cmake-config

Apply minor fixes to CMake configuration

Author: lemire

CMakeLists.txt

@@ -9,25 +9,25 @@ project(is_utf8
 include(GNUInstallDirs)
 include(CTest)
 
+option(IS_UTF8_SANITIZE "Sanitize addresses" OFF)
+
 if (NOT CMAKE_BUILD_TYPE)
   message(STATUS "No build type selected, default to Release")
-  if(SIMDUTF_SANITIZE)
+  if(IS_UTF8_SANITIZE)
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
   else()
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
   endif()
 endif()
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake")
-
 # We compile tools, tests, etc. with C++ 17. Override yourself if you need on a target.
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_MACOSX_RPATH OFF)
 
-set(IS_UTF8_LIB_VERSION "2.0.9" CACHE STRING "is_utf8 library version")
-set(IS_UTF8_LIB_SOVERSION "2" CACHE STRING "is_utf8 library soversion")
+set(IS_UTF8_LIB_VERSION "1.0.0" CACHE STRING "is_utf8 library version")
+set(IS_UTF8_LIB_SOVERSION "1" CACHE STRING "is_utf8 library soversion")
 
 set(IS_UTF8_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -79,7 +79,7 @@ write_basic_package_version_file(
 )
 
 set(
-    IS_UTF8_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/simdutf"
+    IS_UTF8_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/is_utf8"
     CACHE STRING "CMake package config location relative to the install prefix"
 )
 mark_as_advanced(IS_UTF8_INSTALL_CMAKEDIR)

cmake/add_cpp_test.cmake

@@ -10,7 +10,7 @@ function(add_cpp_test TEST_NAME)
   if (ARGS_COMPILE_ONLY)
     list(APPEND ${ARGS_LABELS} compile_only)
   endif()
-  if(SIMDUTF_SANITIZE)
+  if (IS_UTF8_SANITIZE)
     add_compile_options(-fsanitize=address  -fno-omit-frame-pointer -fno-sanitize-recover=all)
     add_compile_definitions(ASAN_OPTIONS=detect_leaks=1)
   endif()

cmake/is_utf8-config.cmake.in

@@ -1,2 +1,2 @@
 
-include("${CMAKE_CURRENT_LIST_DIR}/simdutfTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/is_utf8Targets.cmake")

tests/CMakeLists.txt

@@ -1,9 +1,8 @@
-set(SIMDUTF_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../)
 if(MSVC)
   add_compile_options("/Zi" "/EHsc" "/GR")
 endif()
 
 include(${PROJECT_SOURCE_DIR}/cmake/add_cpp_test.cmake)
 link_libraries(is_utf8)
 
-add_cpp_test(unit)
+add_cpp_test(unit)