TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix issue with HAVE_X safety checks falsely failing

Browse Source
This commit is contained in:
Sam Edwards 2020-01-08 20:13:34 -07:00
parent 1204de6e09
commit 3104bf3710
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/macros/PackageConfig.cmake
View File

@ -149,7 +149,8 @@ function(package_option name)
endif() endif()
# If it was set by the user but not found, display an error. # If it was set by the user but not found, display an error.
if(HAVE_${name} AND NOT ${found_as}_FOUND) string(TOUPPER "${found_as}" FOUND_AS)
if(HAVE_${name} AND NOT ${found_as}_FOUND AND NOT ${FOUND_AS}_FOUND)
message(SEND_ERROR "NOT FOUND: ${name}. Disable HAVE_${name} to continue.") message(SEND_ERROR "NOT FOUND: ${name}. Disable HAVE_${name} to continue.")
endif() endif()
@ -209,8 +210,6 @@ function(package_option name)
endforeach(implib) endforeach(implib)
if(use_variables) if(use_variables)
string(TOUPPER "${found_as}" FOUND_AS)
if(DEFINED ${found_as}_INCLUDE_DIRS) if(DEFINED ${found_as}_INCLUDE_DIRS)
set(includes ${${found_as}_INCLUDE_DIRS}) set(includes ${${found_as}_INCLUDE_DIRS})
elseif(DEFINED ${found_as}_INCLUDE_DIR) elseif(DEFINED ${found_as}_INCLUDE_DIR)