Merge pull request #995 from KineticTheory/bugfix_cmake_config_types

Bug fix: CMAKE_CONFIGURATION_TYPES should not be set for Makefiles
lanl · Dec 22, 2020 · b0ef4c7 · b0ef4c7
2 parents 858b1ff + c282072
commit b0ef4c7
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/config/draco-config-install.cmake.in b/config/draco-config-install.cmake.in
@@ -16,16 +16,15 @@ include( "${_SELF_DIR}/draco-targets.cmake" )
 set( DRACO_CONFIG_DIR "${_SELF_DIR}" )
 
 # Inspect properties of Lib_dsxx to find a list of configurations
-if( TARGET Lib_dsxx )
-  get_target_property( DRACO_CONFIGURATION_TYPES Lib_dsxx IMPORTED_CONFIGURATIONS)
+if( CMAKE_CONFIGURATION_TYPES ) # multi-config project files (not Makefiles)
+  if( TARGET Lib_dsxx )
+    get_target_property( DRACO_CONFIGURATION_TYPES Lib_dsxx IMPORTED_CONFIGURATIONS)
+  endif()
+  if( DRACO_CONFIGURATION_TYPES )
+    set( CMAKE_CONFIGURATION_TYPES "${DRACO_CONFIGURATION_TYPES}" CACHE STRING
+      "Available build configurations" FORCE )
+  endif()
 endif()
-if( DRACO_CONFIGURATION_TYPES )
-  set( CMAKE_CONFIGURATION_TYPES "${DRACO_CONFIGURATION_TYPES}")
-else()
-  set( CMAKE_CONFIGURATION_TYPES "@CMAKE_CONFIGURATION_TYPES@")
-endif()
-set( CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING
-  "Available build configurations" FORCE )
 
 # Provide some pretty print information during configure
 include( FeatureSummary )