Kaynağa Gözat

FIX: make CMAKE_X_LIBS and CMAKE_X_CFLAGS advanced

Sebastien Barre 23 yıl önce
ebeveyn
işleme
309748ff79

+ 5 - 2
Modules/CMakeBackwardCompatibilityC.cmake

@@ -53,9 +53,12 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
 ENDIF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
 ENDIF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
 
 
 MARK_AS_ADVANCED(
 MARK_AS_ADVANCED(
+CMAKE_HP_PTHREADS
 CMAKE_THREAD_LIBS
 CMAKE_THREAD_LIBS
 CMAKE_USE_PTHREADS
 CMAKE_USE_PTHREADS
-CMAKE_USE_WIN32_THREADS
 CMAKE_USE_SPROC
 CMAKE_USE_SPROC
-CMAKE_HP_PTHREADS)
+CMAKE_USE_WIN32_THREADS
+CMAKE_X_CFLAGS
+CMAKE_X_LIBS
+)
 
 

+ 1 - 0
Modules/FindX11.cmake

@@ -164,6 +164,7 @@ IF (UNIX)
     CMAKE_Xext_LIB
     CMAKE_Xext_LIB
     CMAKE_Xlib_INCLUDE_PATH
     CMAKE_Xlib_INCLUDE_PATH
     CMAKE_Xutil_INCLUDE_PATH
     CMAKE_Xutil_INCLUDE_PATH
+    CMAKE_X_LIBS
     )
     )
 
 
 ENDIF (UNIX)
 ENDIF (UNIX)