Merge pull request #748 from bettio/make-dialyzer-optional

Do not require dialyzer, skip PLT build in case dialyzer has not been found.

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later

Author: bettio

.gitignore

@@ -10,6 +10,7 @@ build/**
 xcode/**
 src/platforms/esp32/build/**
 src/platforms/esp32/build/**/*.d
+src/platforms/esp32/test/build/**
 src/platforms/esp32/components/**
 src/platforms/esp32/sdkconfig
 !src/platforms/esp32/components/avm_builtins/

CMakeLists.txt

@@ -23,6 +23,7 @@ cmake_minimum_required (VERSION 3.13)
 project(AtomVM)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
 
+find_package(Dialyzer)
 find_package(Elixir)
 
 option(AVM_DISABLE_FP "Disable floating point support." OFF)
@@ -32,6 +33,7 @@ option(AVM_VERBOSE_ABORT "Print module and line number on VM abort" OFF)
 option(AVM_RELEASE "Build an AtomVM release" OFF)
 option(AVM_CREATE_STACKTRACES "Create stacktraces" ON)
 option(COVERAGE "Build for code coverage" OFF)
+option(RUN_DIALYZER "Run dialyzer on BEAM modules" ON)
 
 if((${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") OR
    (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") OR

CMakeModules/FindDialyzer.cmake

@@ -0,0 +1,27 @@
+#
+# This file is part of AtomVM.
+#
+# Copyright 2019 Riccardo Binetti <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
+#
+
+find_program(DIALYZER_PATH dialyzer)
+
+if (DIALYZER_PATH)
+    set(Dialyzer_FOUND TRUE)
+elseif(Dialyzer_FIND_REQUIRED)
+    message(FATAL_ERROR "dialyzer not found")
+endif()

libs/CMakeLists.txt

@@ -40,18 +40,22 @@ else()
     pack_lib(atomvmlib eavmlib estdlib alisp)
 endif()
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.plt
-    DEPENDS atomvmlib
-    COMMAND dialyzer --build_plt --output_plt ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.plt
-        -r ${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/beams
-        -r ${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/beams
-        -r ${CMAKE_CURRENT_BINARY_DIR}/alisp/src/beams
-)
+if (Dialyzer_FOUND AND RUN_DIALYZER)
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.plt
+        DEPENDS atomvmlib
+        COMMAND dialyzer --build_plt --output_plt ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.plt
+            -r ${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/beams
+            -r ${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/beams
+            -r ${CMAKE_CURRENT_BINARY_DIR}/alisp/src/beams
+    )
 
-add_custom_target(atomvmlib_plt ALL
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.plt
-)
+    add_custom_target(atomvmlib_plt ALL
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.plt
+    )
+else()
+    message("Dialyzer is not enabled -- skipping PLT build")
+endif()
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/atomvmlib.avm