small fixes

Author: cuckydev

CMakeLists.txt

@@ -1,9 +1,11 @@
-cmake_minimum_required(VERSION 3.26)
+cmake_minimum_required(VERSION 3.14)
 
 # Leon project
+set(LEON_VERSION 0.2.0)
+
 project(Leon
 	LANGUAGES C CXX
-	VERSION 0.2.0
+	VERSION ${LEON_VERSION}
 	HOMEPAGE_URL "https://ckdev.org/"
 )
 
@@ -15,7 +17,7 @@ add_library(Leon INTERFACE)
 
 target_include_directories(Leon INTERFACE "Include")
 
-target_compile_definitions(Leon INTERFACE LEON_VERSION="${CMAKE_PROJECT_VERSION}")
+target_compile_definitions(Leon INTERFACE LEON_VERSION="${LEON_VERSION}")
 
 # Compile Leon CLI app
 add_executable(Leon.CLI
@@ -85,8 +87,12 @@ else()
 endif()
 
 # Compile and link luau
-set(LUAU_BUILD_TESTS OFF)
-add_subdirectory("ThirdParty/luau" EXCLUDE_FROM_ALL)
+if (NOT TARGET Luau.Compiler)
+	set(LUAU_BUILD_CLI OFF)
+	set(LUAU_BUILD_TESTS OFF)
+	set(LUAU_BUILD_WEB OFF)
+	add_subdirectory("ThirdParty/luau" EXCLUDE_FROM_ALL)
+endif()
 
 target_link_libraries(Leon.CLI PRIVATE Luau.Compiler Luau.VM)
 

Include/Leon/Leon.h

@@ -26,10 +26,12 @@
 
 #define LEON __attribute__((annotate("@leon")))
 #define LEON_KV(key, value) __attribute__((annotate("@leonkv " #key " " #value)))
+#define LEON_V(value) __attribute__((annotate("@leonkv " #value " \"true\"")))
 
 #else
 
 #define LEON
 #define LEON_KV(...)
+#define LEON_V(...)
 
 #endif

Source/Leon.cpp

@@ -47,7 +47,7 @@ static StdPath GetStdPath(const std::string &src)
 
 	// TODO: I think this throws exceptions with non-ANSI characters with MSVC
 	// I don't have a particularly convenient way to test that right now though.
-	out.utf8 = out.path.u8string();
+	out.utf8 = out.path.string();
 	for (auto &i : out.utf8)
 		if (i == '\\')
 			i = '/';
@@ -318,7 +318,7 @@ int main(int argc, char **argv)
 		for (auto &source : source_args)
 		{
 			// Get shorthand name
-			std::string short_name = source.std.path.filename().u8string();
+			std::string short_name = source.std.path.filename().string();
 
 			if (!source.rebuild)
 			{
@@ -378,6 +378,7 @@ int main(int argc, char **argv)
 					{
 						case CXError_Failure:
 							problem = "Failure";
+							break;
 						case CXError_Crashed:
 							problem = "Crashed";
 							break;
@@ -389,6 +390,7 @@ int main(int argc, char **argv)
 							break;
 						default:
 							problem = std::to_string(ec);
+							break;
 					}
 					throw std::runtime_error(problem + " wasn't caught by a diagnostic.");
 				}
@@ -519,7 +521,7 @@ int main(int argc, char **argv)
 		std::cerr << "========================================" << '\n';
 		std::cerr << "Leon generator failed!" << '\n';
 		std::cerr << "========================================" << '\n';
-		std::cerr << e.what() << std::endl;
+		std::cerr << "Error: " << e.what() << std::endl;
 		return 1;
 	}