1.99.85

MyxCMakeConfig.cmake

@@ -9,18 +9,22 @@ get_filename_component(MYX_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTO
 set(MYX_CMAKE_BACKPORTS_DIR "${MYX_CMAKE_SOURCE_DIR}/backports")
 set(MYX_CMAKE_LIB_DIR "${MYX_CMAKE_SOURCE_DIR}/lib")
 
-include(${MYX_CMAKE_LIB_DIR}/macro/CreateSymlink.cmake)
-include(${MYX_CMAKE_LIB_DIR}/macro/FindPackages.cmake)
-include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)
-
 include(${MYX_CMAKE_BACKPORTS_DIR}/IncludeGuard.cmake)
 include(${MYX_CMAKE_BACKPORTS_DIR}/TopLevelProject.cmake)
 if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
   include(${MYX_CMAKE_BACKPORTS_DIR}/FetchContent.cmake)
+else()
+  include(FetchContent)
 endif()
 
+include(GNUInstallDirs)
+include(CMakeDependentOption)
+
+include(${MYX_CMAKE_LIB_DIR}/macro/CreateSymlink.cmake)
+include(${MYX_CMAKE_LIB_DIR}/macro/FindPackages.cmake)
+include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)
+
 include(${MYX_CMAKE_LIB_DIR}/PopulateCMakeBinaryDir.cmake)
-include(${MYX_CMAKE_LIB_DIR}/Includes.cmake)
 include(${MYX_CMAKE_LIB_DIR}/CurrentDate.cmake)
 include(${MYX_CMAKE_LIB_DIR}/ColoredMessages.cmake)
 include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWarning.cmake)

MyxCMakeConfigVersion.cmake

@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "1.99.84")
+set(MYX_CMAKE_PACKAGE_VERSION "1.99.85")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()

README.md

@@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
   set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
 endif()
 if(DEFINED ENV{MYX_CMAKE_DIR})
-  find_package(MyxCMake 1.99.84 REQUIRED)
+  find_package(MyxCMake 1.99.85 REQUIRED)
 else()
   if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 1.99.84 REQUIRED)
+    find_package(MyxCMake 1.99.85 REQUIRED)
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
   endif()

VERSION

@@ -1 +1 @@
-1.99.84
+1.99.85

lib/Includes.cmake

@@ -1,5 +0,0 @@
-include_guard(GLOBAL)
-
-include(FetchContent)
-include(GNUInstallDirs)
-include(CMakeDependentOption)