Drop LIBSCRATCHCPP_USE_LLVM option

Author: adazem009

CMakeLists.txt

@@ -8,7 +8,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 option(LIBSCRATCHCPP_BUILD_UNIT_TESTS "Build unit tests" ON)
 option(LIBSCRATCHCPP_NETWORK_SUPPORT "Support for downloading projects" ON)
-option(LIBSCRATCHCPP_USE_LLVM "Compile scripts to LLVM IR (work in progress)" OFF)
 option(LIBSCRATCHCPP_PRINT_LLVM_IR "Print LLVM IR of compiled Scratch scripts (for debugging)" OFF)
 
 add_library(scratchcpp SHARED)
@@ -57,31 +56,21 @@ target_sources(scratchcpp
     include/scratchcpp/comment.h
     include/scratchcpp/monitor.h
     include/scratchcpp/imonitorhandler.h
+    include/scratchcpp/dev/compiler.h
+    include/scratchcpp/dev/compilercontext.h
+    include/scratchcpp/dev/compilervalue.h
+    include/scratchcpp/dev/compilerconstant.h
+    include/scratchcpp/dev/compilerlocalvariable.h
+    include/scratchcpp/dev/executablecode.h
+    include/scratchcpp/dev/executioncontext.h
+    include/scratchcpp/dev/promise.h
+    include/scratchcpp/dev/test/scriptbuilder.h
 )
 
-if (LIBSCRATCHCPP_USE_LLVM)
-    target_compile_definitions(scratchcpp PUBLIC USE_LLVM)
-    target_sources(scratchcpp
-      PUBLIC
-        include/scratchcpp/dev/compiler.h
-        include/scratchcpp/dev/compilercontext.h
-        include/scratchcpp/dev/compilervalue.h
-        include/scratchcpp/dev/compilerconstant.h
-        include/scratchcpp/dev/compilerlocalvariable.h
-        include/scratchcpp/dev/executablecode.h
-        include/scratchcpp/dev/executioncontext.h
-        include/scratchcpp/dev/promise.h
-        include/scratchcpp/dev/test/scriptbuilder.h
-    )
-
-    if(LIBSCRATCHCPP_PRINT_LLVM_IR)
-        target_compile_definitions(scratchcpp PRIVATE PRINT_LLVM_IR)
-    endif()
-else()
-    target_sources(scratchcpp
-      PUBLIC
-        include/scratchcpp/compiler.h
-    )
+target_compile_definitions(scratchcpp PUBLIC USE_LLVM)
+
+if(LIBSCRATCHCPP_PRINT_LLVM_IR)
+    target_compile_definitions(scratchcpp PRIVATE PRINT_LLVM_IR)
 endif()
 
 include(FetchContent)
@@ -113,11 +102,9 @@ if (LIBSCRATCHCPP_NETWORK_SUPPORT)
     target_compile_definitions(scratchcpp PRIVATE LIBSCRATCHCPP_NETWORK_SUPPORT)
 endif()
 
-if (LIBSCRATCHCPP_USE_LLVM)
-    include(build/HunterPackages.cmake)
-    include(build/LLVM.cmake)
-    target_link_libraries(scratchcpp PRIVATE LLVM)
-endif()
+include(build/HunterPackages.cmake)
+include(build/LLVM.cmake)
+target_link_libraries(scratchcpp PRIVATE LLVM)
 
 target_compile_definitions(scratchcpp PRIVATE LIBSCRATCHCPP_LIBRARY)
 target_compile_definitions(scratchcpp PRIVATE LIBSCRATCHCPP_VERSION="${PROJECT_VERSION}")

src/CMakeLists.txt

@@ -11,15 +11,11 @@ target_sources(scratchcpp
     rect_p.h
 )
 
-if (NOT LIBSCRATCHCPP_USE_LLVM)
-    add_subdirectory(blocks)
-endif()
+#add_subdirectory(blocks)
 
 add_subdirectory(engine)
 add_subdirectory(internal)
 add_subdirectory(scratch)
 add_subdirectory(audio)
 
-if (LIBSCRATCHCPP_USE_LLVM)
-    add_subdirectory(dev)
-endif()
+add_subdirectory(dev)

src/engine/CMakeLists.txt

@@ -21,12 +21,3 @@ target_sources(scratchcpp
     internal/randomgenerator.h
     internal/randomgenerator.cpp
 )
-
-if(NOT LIBSCRATCHCPP_USE_LLVM)
-    target_sources(scratchcpp
-      PRIVATE
-        compiler.cpp
-        compiler_p.cpp
-        compiler_p.h
-    )
-endif()

test/CMakeLists.txt

@@ -34,9 +34,6 @@ add_subdirectory(rect)
 add_subdirectory(network)
 add_subdirectory(audio)
 
-if(LIBSCRATCHCPP_USE_LLVM)
-    add_subdirectory(dev)
-else()
-    add_subdirectory(compiler)
-    add_subdirectory(blocks)
-endif()
+add_subdirectory(dev)
+#add_subdirectory(compiler)
+#add_subdirectory(blocks)