]> code.bitgloo.com Git - clyne/entityx.git/commitdiff
Update FindEntityX.cmake
authorAlex Tennant <adtennant@gmail.com>
Thu, 10 Dec 2015 16:28:03 +0000 (16:28 +0000)
committerAlex Tennant <adtennant@gmail.com>
Thu, 10 Dec 2015 16:28:03 +0000 (16:28 +0000)
To be consistent with other CMake modules ENTITYX_LIBRARIES and ENTITYX_INCLUDE_DIRS should be exposed. find_package_handle_standard_args should be used to set ENTITYX_FOUND.

cmake/FindEntityX.cmake

index cf19aed43a4a591503c249ead92630a684b8127d..fad310d38b1d25f7baa73a128f0f8b66dbaf9990 100644 (file)
@@ -1,28 +1,34 @@
-# Look for a version of EntityX on the local machine
+# Look for a version of EntityX on the local machine
 #
 # By default, this will look in all common places. If EntityX is built or
 # installed in a custom location, you're able to either modify the
 # CMakeCache.txt file yourself or simply pass the path to CMake using either the
 # environment variable `ENTITYX_ROOT` or the CMake define with the same name.
 
-set(ENTITYX_PATHS      ${ENTITYX_ROOT}
-                                       $ENV{ENTITYX_ROOT}
-                                       ~/Library/Frameworks
-                                       /Library/Frameworks
-                                       /usr/local
-                                       /usr
-                                       /sw
-                                       /opt/local
-                                       /opt/csw
-                                       /opt)
+set(ENTITYX_PATHS
+    ${ENTITYX_ROOT}
+       $ENV{ENTITYX_ROOT}
+       ~/Library/Frameworks
+       /Library/Frameworks
+       /usr/local
+       /usr
+       /sw
+       /opt/local
+       /opt/csw
+       /opt
+)
 
 find_path(ENTITYX_INCLUDE_DIR entityx/entityx.h PATH_SUFFIXES include PATHS ${ENTITYX_PATHS})
 find_library(ENTITYX_LIBRARY NAMES entityx PATH_SUFFIXES lib PATHS ${ENTITYX_PATHS})
 find_library(ENTITYX_LIBRARY_DEBUG NAMES entityx-d PATH_SUFFIXES lib PATHS ${ENTITYX_PATHS})
-mark_as_advanced(ENTITYX_INCLUDE_DIR ENTITYX_LIBRARY)
 
-if(ENTITYX_INCLUDE_DIR AND ENTITYX_LIBRARY)
-       set(ENTITYX_FOUND TRUE)
-else()
-       set(ENTITYX_FOUND FALSE)
-endif()
+set(ENTITYX_LIBRARIES ${ENTITYX_LIBRARY})
+set(ENTITYX_INCLUDE_DIRS ${ENTITYX_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+
+# handle the QUIETLY and REQUIRED arguments and set ENTITYX_FOUND to TRUE if
+# all listed variables are TRUE
+find_package_handle_standard_args(entityx DEFAULT_MSG ENTITYX_LIBRARY ENTITYX_INCLUDE_DIR)
+
+mark_as_advanced(ENTITYX_INCLUDE_DIR ENTITYX_LIBRARY)