accommodate machine_types dependency

nicolaslg · nicolaslg · commit 60a335414ba1 · 2024-02-20T21:05:31.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ include(CMakePrintHelpers)
 
 project(smooth3D 
   LANGUAGES C CXX 
-  VERSION 3.2.0)
+  VERSION 3.3.0)
 
 cmake_print_variables(smooth3D_VERSION)
 
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -5,10 +5,10 @@
         "name": "ci",
         "cacheVariables": {
           "CMAKE_POSITION_INDEPENDENT_CODE": "ON",
-          "WITH_EXTERNAL_MACHINETYPES": "OFF",
           "Mesquite_ROOT": "$env{INSTALL_DIR}/mesquite-2.3.0",
           "gmds_ROOT": "$env{INSTALL_DIR}/gmds072",
-          "Lima_ROOT": "$env{INSTALL_DIR}/lima"
+          "Lima_ROOT": "$env{INSTALL_DIR}/lima",
+	  "MachineTypes_ROOT": "$env{INSTALL_DIR}/machine_types"
         }
       }
     ]
diff --git a/smooth3D/smooth3DConfig.cmake.in b/smooth3D/smooth3DConfig.cmake.in
@@ -1,3 +1,6 @@
+include(CMakeFindDependencyMacro)
+find_dependency(MachineTypes)
+
 set(smooth3D_VERSION "@smooth3D_VERSION@")
 
 @PACKAGE_INIT@

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`"name": "ci",`
`6`	`6`	`"cacheVariables": {`
`7`	`7`	`"CMAKE_POSITION_INDEPENDENT_CODE": "ON",`
`8`		`- "WITH_EXTERNAL_MACHINETYPES": "OFF",`
`9`	`8`	`"Mesquite_ROOT": "$env{INSTALL_DIR}/mesquite-2.3.0",`
`10`	`9`	`"gmds_ROOT": "$env{INSTALL_DIR}/gmds072",`
`11`		`- "Lima_ROOT": "$env{INSTALL_DIR}/lima"`
	`10`	`+ "Lima_ROOT": "$env{INSTALL_DIR}/lima",`
	`11`	`+ "MachineTypes_ROOT": "$env{INSTALL_DIR}/machine_types"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`]`