diff options
| -rw-r--r-- | modules/FindJasper.cmake | 2 | ||||
| -rw-r--r-- | modules/FindX11.cmake | 27 | ||||
| -rw-r--r-- | modules/FindZLIB.cmake | 2 |
3 files changed, 20 insertions, 11 deletions
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake index 268d71bf..f5835276 100644 --- a/modules/FindJasper.cmake +++ b/modules/FindJasper.cmake @@ -34,4 +34,4 @@ else(JASPER_FOUND) endif(Jasper_FIND_REQUIRED) endif(JASPER_FOUND) -MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES) +MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES JASPER_LIBRARY) diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 958f7659..867761b2 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -236,11 +236,11 @@ if (UNIX) X11_X11_INCLUDE_PATH X11_X11_LIB X11_Xext_LIB - X11_Xau_LIB + X11_Xau_LIB X11_Xlib_INCLUDE_PATH X11_Xutil_INCLUDE_PATH X11_Xcomposite_INCLUDE_PATH - X11_Xcomposite_LIB + X11_Xcomposite_LIB X11_Xaccess_INCLUDE_PATH X11_Xfixes_LIB X11_Xfixes_INCLUDE_PATH @@ -250,19 +250,26 @@ if (UNIX) X11_Xdamage_INCLUDE_PATH X11_Xrender_LIB X11_Xrender_INCLUDE_PATH - X11_Xxf86misc_LIB - X11_Xxf86misc_INCLUDE_PATH - X11_Xinerama_LIB - X11_Xinerama_INCLUDE_PATH + X11_Xxf86misc_LIB + X11_Xxf86misc_INCLUDE_PATH + X11_Xinerama_LIB + X11_Xinerama_INCLUDE_PATH X11_XTest_LIB X11_XTest_INCLUDE_PATH X11_Xcursor_LIB X11_Xcursor_INCLUDE_PATH - X11_dpms_INCLUDE_PATH - X11_Xt_LIB - X11_Xss_LIB - X11_Xdmcp_LIB + X11_dpms_INCLUDE_PATH + X11_Xt_LIB + X11_Xss_LIB + X11_Xdmcp_LIB X11_LIBRARIES + X11_Xaccessrules_INCLUDE_PATH + X11_Xaccessstr_INCLUDE_PATH + X11_Xdmcp_INCLUDE_PATH + X11_Xf86misc_INCLUDE_PATH + X11_Xkb_INCLUDE_PATH + X11_Xkblib_INCLUDE_PATH + X11_Xscreensaver_INCLUDE_PATH ) endif (UNIX) diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake index e114d450..777c47ef 100644 --- a/modules/FindZLIB.cmake +++ b/modules/FindZLIB.cmake @@ -28,3 +28,5 @@ ELSE(ZLIB_FOUND) MESSAGE(FATAL_ERROR "Could not find z library") ENDIF(ZLIB_FIND_REQUIRED) ENDIF(ZLIB_FOUND) + +MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
\ No newline at end of file |