| 1234567891011121314151617181920212223242526272829303132333435363738 |
- diff --git a/build/cmake/modules/FindGTK3.cmake b/build/cmake/modules/FindGTK3.cmake
- index d2939a1..b8f5fab 100644
- --- a/build/cmake/modules/FindGTK3.cmake
- +++ b/build/cmake/modules/FindGTK3.cmake
- @@ -29,7 +29,7 @@
- # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- find_package(PkgConfig)
- -pkg_check_modules(GTK3 QUIET gtk+-3.0)
- +pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
- set(VERSION_OK TRUE)
- if (GTK3_VERSION)
- if (GTK3_FIND_VERSION_EXACT)
- @@ -45,9 +45,10 @@ endif ()
- # Check for GDK Wayland support
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS})
- +link_directories(${GTK3_LIBRARY_DIRS})
- check_symbol_exists(GDK_WINDOWING_WAYLAND "gdk/gdk.h" wxHAVE_GDK_WAYLAND)
- check_symbol_exists(GDK_WINDOWING_X11 "gdk/gdk.h" wxHAVE_GDK_X11)
- include(FindPackageHandleStandardArgs)
- -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
- +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARY_DIRS GTK3_LIBRARIES VERSION_OK)
-
- -mark_as_advanced(GTK3_INCLUDE_DIRS GTK3_LIBRARIES)
- +mark_as_advanced(GTK3_INCLUDE_DIRS GTK3_LIBRARY_DIRS GTK3_LIBRARIES)
- diff --git a/build/cmake/modules/FindWAYLANDEGL.cmake b/build/cmake/modules/FindWAYLANDEGL.cmake
- index ad23bf9..8208d19 100644
- --- a/build/cmake/modules/FindWAYLANDEGL.cmake
- +++ b/build/cmake/modules/FindWAYLANDEGL.cmake
- @@ -14,6 +14,7 @@ if (WAYLANDEGL_VERSION)
- endif ()
- endif ()
-
- +link_directories(${WAYLANDEGL_LIBRARY_DIRS})
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLANDEGL DEFAULT_MSG WAYLANDEGL_LIBRARIES VERSION_OK)
-
|
