spglib · LecrisUT · Aug 22, 2023 · Aug 14, 2023 · Aug 17, 2023 · Aug 14, 2023
diff --git a/.distro/plans/examples.fmf b/.distro/plans/examples.fmf
@@ -0,0 +1,8 @@
+summary:
+  Examples
+discover+:
+  how: fmf
+  filter: "tag: examples"
+  path: example
+execute:
+    how: tmt
diff --git a/.distro/plans/main.fmf.dist-git b/.distro/plans/main.fmf.dist-git
@@ -1,3 +1,4 @@
 discover:
   how: fmf
   dist-git-source: true
+  dist-git-extract: spglib-*/
diff --git a/.distro/plans/package.fmf b/.distro/plans/package.fmf
@@ -0,0 +1,8 @@
+summary:
+  Test importing package
+discover+:
+  how: fmf
+  filter: "tag: package"
+  path: test
+execute:
+  how: tmt
diff --git a/.distro/plans/rpmlint.fmf b/.distro/plans/rpmlint.fmf
@@ -7,14 +7,6 @@ prepare:
     - rpmlint
     - rpminspect
     - rpminspect-data-fedora
-  ## TODO: Disabled because upstream failure
-  ## https://github.com/packit/packit/issues/1978
-  #- name: Download the source rpm
-  #  how: shell
-  #  script: cd /tmp && curl -O ${PACKIT_SRPM_URL}
-  - name: Download rpm packages
-    how: shell
-    script: cd /tmp && dnf download ${PACKIT_COPR_RPMS}
 discover+:
   how: fmf
   filter: "tag: rpmlint"

diff --git a/.distro/plans/smoke.fmf b/.distro/plans/smoke.fmf
@@ -1,6 +1,6 @@
 summary:
   Basic smoke tests
-discover+:
+discover:
   how: fmf
   filter: "tag: smoke"
 execute:

diff --git a/.distro/spglib.spec b/.distro/spglib.spec
@@ -66,7 +66,8 @@ develop applications with spglib Python3 bindings.
     -DSPGLIB_SHARED_LIBS=ON \
     -DSPGLIB_WITH_Fortran=ON \
     -DSPGLIB_WITH_Python=OFF \
-    -DSPGLIB_WITH_TESTS=ON
+    -DSPGLIB_WITH_TESTS=ON \
+    -DCMAKE_INSTALL_MODULEDIR=%{_fmoddir}
 
 %cmake_build
 %pyproject_wheel
@@ -109,10 +110,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} %pytest -v
 %files fortran-devel
 %{_libdir}/libspglib_f08.so
 %{_includedir}/spglib_f08.F90
-# TODO: Mod files should be in %%{_fmoddir} according to the guidelines
-# Unclear how to proceed on cmake side to be general
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Fortran/
-%{_includedir}/spglib_f08.mod
+%{_fmoddir}/spglib_f08.mod
 %{_libdir}/pkgconfig/spglib_f08.pc
 %{_libdir}/cmake/Spglib/SpglibTargets_fortran*
 

diff --git a/.distro/tests/rpmlint.fmf b/.distro/tests/rpmlint.fmf
@@ -7,7 +7,7 @@ path: /
 # Define tests
 /rpmlint:
   summary: Rpmlint spec and rpmfiles
-  test: rpmlint -c packit.toml -r spglib.rpmlintrc ./*.spec /tmp/*.rpm
+  test: rpmlint -c packit.toml -r spglib.rpmlintrc ./*.spec /var/share/test-artifacts/*.rpm
 /rpminspect-rpms:
   summary: Rpminspect the rpms
-  test: ls /tmp/*.rpm | xargs -L1 rpminspect-fedora -E metadata,disttag
+  test: ls /var/share/test-artifacts/*.rpm | xargs -L1 rpminspect-fedora -E metadata,disttag
diff --git a/.packit.yaml b/.packit.yaml
@@ -16,8 +16,8 @@ files_to_sync:
   - src: .distro/plans/
     dest: plans/
     filters:
-      - "- .distro/plans/main.fmf.dist-git"
-      - "- .distro/plans/rpmlint.fmf"
+      - "- main.fmf.dist-git"
+      - "- rpmlint.fmf"
   - src: .distro/plans/main.fmf.dist-git
     dest: plans/main.fmf
 upstream_package_name: spglib

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,6 +64,14 @@ mark_as_advanced(SPGLIB_DEBUG)
 #                                     Project configuration                                     #
 ]==============================================================================================]
 
+# Compatibilities
+# TODO: Remove when requiring cmake >= 3.20
+if (NOT COMMAND cmake_path)
+	# Note: This is not an actual replacement of cmake_path, just a minimal implementation for
+	# this project
+	include(cmake/compat/cmake_path.cmake)
+endif ()
+
 # Include basic tools
 include(cmake/PackageCompsHelper.cmake)
 include(FetchContent)

diff --git a/cmake/compat/cmake_path.cmake b/cmake/compat/cmake_path.cmake
@@ -0,0 +1,20 @@
+# Note: This is not an actual replacement of cmake_path, just a minimal implementation for
+# spglib project
+function(cmake_path operator path_var)
+	if (NOT ${operator} STREQUAL APPEND)
+		message(FATAL_ERROR Unsupported operator)
+	endif ()
+
+	set(ARGS_Options)
+	set(ARGS_OneValue "OUTPUT_VARIABLE")
+	set(ARGS_MultiValue)
+	cmake_parse_arguments(ARGS "${ARGS_Options}" "${ARGS_OneValue}" "${ARGS_MultiValue}" ${ARGN})
+
+	if(NOT DEFINED ARGS_OUTPUT_VARIABLE)
+		set(ARGS_OUTPUT_VARIABLE ${path_var})
+	endif ()
+	set(${ARGS_OUTPUT_VARIABLE} ${${path_var}})
+	foreach (path IN LISTS ARGS_UNPARSED_ARGUMENTS)
+		set(${ARGS_OUTPUT_VARIABLE} "${${ARGS_OUTPUT_VARIABLE}}/${path}")
+	endforeach ()
+endfunction()
diff --git a/cmake/spglib.pc.in b/cmake/spglib.pc.in
@@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-
 Name: @PROJECT_NAME@
 Description: The spglib library
 Version: @PROJECT_VERSION@
-Libs: -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lsymspg
-Cflags: -I${prefix}/include
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lsymspg
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@
diff --git a/example/.fmf/version b/example/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/example/c_api/CMakeLists.txt b/example/c_api/CMakeLists.txt
@@ -1,21 +1,14 @@
 cmake_minimum_required(VERSION 3.6)
 project(example_spglib LANGUAGES C)
 
-# Alternatively use pkg-config
-find_package(Spglib)
-if(NOT Spglib_FOUND)
-	find_package(PkgConfig)
-	pkg_check_modules(symspg REQUIRED IMPORTED_TARGET
-			spglib)
-endif()
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_C_EXTENSIONS ON)
 
-add_executable(example_c example.c)
-if(Spglib_FOUND)
-	# Linking using native cmake
-	target_link_libraries(example_c PUBLIC
-			Spglib::symspg)
-else()
-	# Linking using pkg-config
-	target_link_libraries(example_c PUBLIC
-			PkgConfig::symspg)
-endif()
+find_package(Spglib REQUIRED)
+
+add_executable(example example.c)
+add_executable(example_full example_full.c)
+
+target_link_libraries(example PRIVATE Spglib::symspg)
+target_link_libraries(example_full PRIVATE Spglib::symspg)