chore: use readstat library from conan (#6063)

* chore: use readstat library from conan

* fix find library on Linux

* remove some apple stuff

---------

Co-authored-by: Joris Goosen <joris@jorisgoosen.nl>

Author: shun2wang

CMakeLists.txt

@@ -115,9 +115,6 @@ include(Programs)
 # Looking for libraries, e.g., Boost, Qt
 include(Libraries)
 
-# Preparing irregular dependencies, e.g., ReadStat
-include(Dependencies)
-
 # Setting JASP's parameters, e.g., JASP_VERSION
 include(JASP)
 

Desktop/CMakeLists.txt

@@ -101,10 +101,6 @@ if(LOCAL_MODULES_BUILD)
   add_dependencies(JASP ModulesBuild)
 endif()
 
-if(APPLE)
-  add_dependencies(JASPDesktopLib readstat)
-endif()
-
 if(WINDOWS)
   # This is added to the build folder that JASP doesn't try to recreate the
   # junctions in the build folder, they are there anyway!
@@ -177,9 +173,7 @@ target_link_libraries(
     ${LIBFREEXL_LIBRARIES}
     $<$<NOT:$<BOOL:${LINUX}>>:freexl::freexl>
     # ReadStat -----------------------------------
-    ${LIBREADSTAT_LIBRARIES}
-    # Rtools's ReadStat
-    $<$<PLATFORM_ID:Windows>:${RTOOLS_LIBREADSTAT_DLL_A}>
+    $<$<NOT:$<BOOL:${LINUX}>>:readstat::readstat>
     # librdata -----------------------------------
     ${LIBRDATA_LIBRARIES}
     $<$<PLATFORM_ID:Windows>:${RTOOLS_LIBRDATA_DLL_A}>

Engine/CMakeLists.txt

@@ -70,7 +70,6 @@ if(WINDOWS)
     POST_BUILD DEPENDS ${CMAKE_BINARY_DIR}/R-Interface/libR-Interface.dll
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBWINPTHREAD_DLL}       ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBGCC_S_SEH_DLL}        ${CMAKE_BINARY_DIR}
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBREADSTAT_DLL}         ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBSTDCPP_DLL}           ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBRDATA_DLL}            ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_MSYS_DLL}                ${CMAKE_BINARY_DIR}

Tools/CMake/Dependencies.cmake

@@ -421,7 +421,6 @@ if(WIN32)
           ${RTOOLS_MSYS_DLL}
           ${RTOOLS_LIBWINPTHREAD_DLL}
           #${RTOOLS_LIBJSONCPP_DLL}
-          ${RTOOLS_LIBREADSTAT_DLL}
           ${RTOOLS_LIBRDATA_DLL}
           ${RTOOLS_ZLIB_DLL}
           ${RTOOLS_LIBBZ2_DLL}

Tools/CMake/Install.cmake

@@ -42,9 +42,9 @@ find_package(ZLIB 1.2 REQUIRED)
 find_package(Iconv 1.16 REQUIRED)
 find_package(SQLite3 3.37.0 REQUIRED)
 
-#if(USE_CONAN)
-#  find_package(jsoncpp 1.9 REQUIRED)
-#endif()
+if(USE_CONAN)
+  find_package(readstat REQUIRED)
+endif()
 
 find_package(OpenSSL 1.1.1 COMPONENTS SSL Crypto)
 if(NOT OpenSSL_FOUND)
@@ -236,6 +236,7 @@ if(APPLE)
   find_package(Brotli 1.0.9 REQUIRED)
   find_package(freexl 2.0.99 REQUIRED)
   find_package(librdata REQUIRED)
+  find_package(readstat REQUIRED)
 
 endif()
 
@@ -245,7 +246,6 @@ if(WIN32)
 
   find_package(freexl 2.0.99 REQUIRED)
 
-  copy_rtools_header(RTOOLS_LIBREADSTAT_H	readstat.h		${CMAKE_SOURCE_DIR}/Desktop/data/importers/readstat/readstat.h)
   copy_rtools_header(RTOOLS_LIBRDATA_H		rdata.h			${CMAKE_SOURCE_DIR}/Desktop/data/importers/rdata/rdata.h)
 
   find_rtools_dll_path(RTOOLS_ZLIB_DLL            "zlib1.dll")
@@ -256,9 +256,7 @@ if(WIN32)
   find_rtools_dll_path(RTOOLS_LIBRDATA_DLL        "librdata-0.dll")
   find_rtools_dll_path(RTOOLS_LIBSTDCPP_DLL       "libstdc++-6.dll")
   find_rtools_dll_path(RTOOLS_LIBRDATA_DLL_A      "librdata.dll.a")
-  find_rtools_dll_path(RTOOLS_LIBREADSTAT_DLL     "libreadstat-1.dll")
   find_rtools_dll_path(RTOOLS_LIBGCC_S_SEH_DLL    "libgcc_s_seh-1.dll")
-  find_rtools_dll_path(RTOOLS_LIBREADSTAT_DLL_A   "libreadstat.dll.a")
   find_rtools_dll_path(RTOOLS_LIBWINPTHREAD_DLL   "libwinpthread-1.dll")
 
 endif()

Tools/CMake/Libraries.cmake

@@ -22,9 +22,10 @@ def requirements(self):
         self.requires("openssl/3.4.1")
         self.requires("bison/3.7.6")
         self.requires("brotli/1.1.0")
-        self.requires("sqlite3/3.49.1")
+        self.requires("sqlite3/[>=3.49 <4.0]")
         self.requires("gmp/6.3.0")
         self.requires("mpfr/4.2.1")
+        self.requires("readstat/1.1.9")
         self.requires("freexl/2.0.99.cci.20250526")
         # librdata is not available for Windows platforms on conan-center yet
         if self.settings_build.os == "Macos":