fix test mods and version check

.gitignore

@@ -55,6 +55,8 @@ docs
 loader/src/internal/about.cpp
 loader/src/internal/resources.hpp
 loader/resources/mod.json
+loader/test/dependency/mod.json
+loader/test/main/mod.json
 loader/resources/version
 loader/resources/blanks/rename.js
 loader/resources/about.md

CMakeLists.txt

@@ -19,6 +19,7 @@ option(GEODE_USE_BREAKPAD "Enables the use of the Breakpad library for crash dum
 file(READ VERSION GEODE_VERSION)
 string(STRIP "${GEODE_VERSION}" GEODE_VERSION)
 set(GEODE_VERSION "${GEODE_VERSION}" CACHE INTERNAL "Geode version")
+set(GEODE_VERSION_FULL "${GEODE_VERSION}" CACHE INTERNAL "Geode version full")
 
 # Check if version has a tag like v1.0.0-alpha
 string(FIND ${GEODE_VERSION} "-" GEODE_VERSION_HAS_TAG)

cmake/GeodeFile.cmake

@@ -90,11 +90,11 @@ function(setup_geode_mod proname)
     string(JSON MOD_HAS_API ERROR_VARIABLE MOD_DOESNT_HAVE_API GET "${MOD_JSON}" "api")
     string(JSON MOD_HAS_DEPS ERROR_VARIABLE MOD_DOESNT_HAVE_DEPS GET "${MOD_JSON}" "dependencies")
 
-    if ("${TARGET_GEODE_VERSION}" STREQUAL "${GEODE_VERSION}")
-        message(STATUS "Mod ${MOD_ID} is compiling for Geode version ${GEODE_VERSION}")
+    if ("${TARGET_GEODE_VERSION}" STREQUAL "${GEODE_VERSION_FULL}")
+        message(STATUS "Mod ${MOD_ID} is compiling for Geode version ${GEODE_VERSION_FULL}")
     else()
         message(FATAL_ERROR
-            "Mod ${MOD_ID} is made for Geode version ${TARGET_GEODE_VERSION} but you have ${GEODE_VERSION} SDK installed. Please change the Geode version in your mod.json. "
+            "Mod ${MOD_ID} is made for Geode version ${TARGET_GEODE_VERSION} but you have ${GEODE_VERSION_FULL} SDK installed. Please change the Geode version in your mod.json. "
         )
     endif()
 

loader/CMakeLists.txt

@@ -12,9 +12,9 @@ else()
 endif()
 
 if (GEODE_VERSION_TAG)
-	set(PROJECT_VERSION_SUFFIX "-${GEODE_VERSION_TAG}")
+	set(PROJECT_VERSION_SUFFIX "-${GEODE_VERSION_TAG}" CACHE INTERNAL "" )
 else()
-	set(PROJECT_VERSION_SUFFIX "")
+	set(PROJECT_VERSION_SUFFIX "" CACHE INTERNAL "" )
 endif()
 
 # I think CMake is trying to link zlib from the host system?

loader/test/dependency/CMakeLists.txt

@@ -12,4 +12,5 @@ add_compile_definitions(EXPORTING_MOD)
 set(GEODE_LINK_SOURCE ON)
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mod.json.in ${CMAKE_CURRENT_SOURCE_DIR}/mod.json)
 create_geode_file(${PROJECT_NAME} DONT_INSTALL)

loader/test/dependency/mod.json.in

@@ -1,5 +1,5 @@
 {
-    "geode":        "2.0.0",
+    "geode":        "@GEODE_VERSION_FULL@",
     "gd":           "*",
 	"version":      "1.0.0",
 	"id":           "geode.testdep",

loader/test/main/CMakeLists.txt

@@ -11,4 +11,5 @@ set(GEODE_LINK_SOURCE ON)
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 target_link_libraries(TestMod TestDependency)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mod.json.in ${CMAKE_CURRENT_SOURCE_DIR}/mod.json)
 setup_geode_mod(${PROJECT_NAME} DONT_INSTALL)

loader/test/main/mod.json.in

@@ -1,5 +1,5 @@
 {
-    "geode":        "2.0.0",
+    "geode":        "@GEODE_VERSION_FULL@",
     "gd": "*",
 	"version":      "1.0.0",
 	"id":           "geode.test",