fix: Julia packaging issues (#341)

spglib · Dec 4, 2023 · 82c2a22 · 82c2a22
2 parents 163f143 + f713aee
commit 82c2a22
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,6 +59,8 @@ option(SPGLIB_WARNINGS "Spglib: Enable warning messages" ON)
 mark_as_advanced(SPGLIB_WITH_WARNINGS)
 option(SPGLIB_DEBUG "Spglib: Build in debug mode" ${_Spglib_default_debug})
 mark_as_advanced(SPGLIB_DEBUG)
+option(SPGLIB_COMPILATION_WARNING "Spglib: Enable compilation warnings" OFF)
+mark_as_advanced(SPGLIB_COMPILATION_WARNING)
 
 #[==============================================================================================[
 #                                     Project configuration                                     #

diff --git a/cmake/CMakePresets-CI.json b/cmake/CMakePresets-CI.json
@@ -27,6 +27,10 @@
         "CMAKE_BUILD_TYPE": {
           "type": "STRING",
           "value": "RelWithDebInfo"
+        },
+        "SPGLIB_COMPILATION_WARNING": {
+          "type": "BOOL",
+          "value": true
         }
       },
       "errors": {

diff --git a/cmake/README.md b/cmake/README.md
@@ -37,7 +37,7 @@ e.g. `-DSPGLIB_WITH_Fortran=ON`.
 | **SPGLIB_WITH_Fortran**  |                 OFF                 | Build Fortran API                                                                  |
 | **SPGLIB_WITH_Python**   |                 OFF                 | Build Python API                                                                   |
 | **SPGLIB_WITH_TESTS**    |                 ON                  | Include basic tests                                                                |
-| **SPGLIB_USE_OMP**       |                 OFF                 | Use OpenMPI                                                                        |
+| **SPGLIB_USE_OMP**       |                 OFF                 | Use OpenMP                                                                         |
 | **SPGLIB_USE_SANITIZER** |                 ""                  | Specify a sanitizer to compile with<br/> e.g. `address`                            |
 | CMAKE_INSTALL_PREFIX     | OS specific<br/>(e.g. `/usr/local`) | Location where to install built project                                            |
 | BUILD_SHARED_LIBS        |                 ON                  | Whether to build shared or statically linked libraries<br/>(Currently unsupported) |

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,13 +1,15 @@
 configure_file(version.h.in version.h)
 
 # Add compiler warnings
-if (MSVC)
-	target_compile_options(Spglib_symspg PRIVATE /W4)
-else()
-	# TODO: C23: Disabled -Wpedantic because of warning spam
-	#  Add it back when C23 standard is widespread and revert this [Temp][C23] commit
-	target_compile_options(Spglib_symspg PRIVATE -Wall -Wextra)
-endif()
+if (SPGLIB_COMPILATION_WARNING)
+	if (MSVC)
+		target_compile_options(Spglib_symspg PRIVATE /W4)
+	else()
+		# TODO: C23: Disabled -Wpedantic because of warning spam
+		#  Add it back when C23 standard is widespread and revert this [Temp][C23] commit
+		target_compile_options(Spglib_symspg PRIVATE -Wall -Wextra)
+	endif()
+endif ()
 
 # Configure main target
 target_sources(Spglib_symspg PRIVATE

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,4 +1,5 @@
 enable_language(CXX)
+include(GoogleTest)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED True)