Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports
 Path: blob/main/irc/dxirc/files/patch-fox_CMakeLists.txt
18157 views
1
--- fox/CMakeLists.txt.orig	2015-11-16 14:35:35 UTC

2
+++ fox/CMakeLists.txt

3
@@ -16,8 +16,17 @@

4
 

5
 if(PKG_CONFIG_FOUND)

6
     pkg_check_modules(FOX fox)

7
-    list(APPEND DXIRCFOX_LIBS ${FOX_LIBRARIES})

8
-    list(APPEND DXIRCFOX_INCLUDE_DIRS ${FOX_INCLUDE_DIRS})

9
+    find_path(FOX_INCLUDE_DIR FXApp.h

10
+    PATHS

11
+    ${FOX_INCLUDE_DIRS}

12
+    /usr/include/fox-1.6

13
+    /usr/local/include/fox-1.6)

14
+    find_library(FOX_LIBRARY FOX-1.6

15
+    ${FOX_LIBRARY_DIRS}

16
+    /usr/lib

17
+    /usr/local/lib)

18
+    list(APPEND DXIRCFOX_LIBS ${FOX_LIBRARY})

19
+    list(APPEND DXIRCFOX_INCLUDE_DIRS ${FOX_INCLUDE_DIR})

20
 endif(PKG_CONFIG_FOUND)

21
 

22
 if(NOT FOX_FOUND)

23
@@ -43,16 +52,14 @@

24
 

25
 set(HAVE_X11 FALSE)

26
 if(NOT WIN32)

27
-    if(PKG_CONFIG_FOUND)

28
-        pkg_check_modules(X11 x11)

29
+    find_package(X11)

30
         list(APPEND DXIRCFOX_LIBS ${X11_LIBRARIES})

31
-        list(APPEND DXIRCFOX_INCLUDE_DIRS ${X11_INCLUDE_DIRS})

32
+        list(APPEND DXIRCFOX_INCLUDE_DIRS ${X11_INCLUDE_DIR})

33
         if(X11_FOUND)

34
             set(HAVE_X11 TRUE)

35
         else(X11_FOUND)

36
             set(FOX_HAVE_TRAY FALSE)

37
         endif(X11_FOUND)

38
-    endif(PKG_CONFIG_FOUND)

39
 else(NOT WIN32)

40
     list(APPEND DXIRCFOX_LIBS "ws2_32" "winmm")

41
 endif(NOT WIN32)

42
@@ -86,21 +93,21 @@

43
 set(HAVE_ENCHANT2 FALSE)

44
 if(USE_ENCHANT)

45
     if(PKG_CONFIG_FOUND)

46
-        pkg_check_modules(ENCHANT enchant-2)

47
-        list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})

48
-        list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})

49
+         pkg_check_modules(ENCHANT enchant)

50
+        find_path(ENCHANT_INCLUDE_DIR enchant++.h

51
+        PATHS

52
+        ${ENCHANT_INCLUDE_DIRS}

53
+        /usr/include/enchant

54
+        /usr/local/include/enchant)

55
+        find_library(ENCHANT_LIBRARY enchant

56
+        ${ENCHANT_LIBRARY_DIRS}

57
+        /usr/lib

58
+        /usr/local/lib)

59
+        list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY})

60
+        list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})

61
         set(HAVE_ENCHANT TRUE)

62
         if(${ENCHANT_VERSION} VERSION_GREATER "1.6")

63
             set(HAVE_ENCHANT2 TRUE)

64
-        endif()

65
-        if(NOT ENCHANT_FOUND)

66
-            pkg_check_modules(ENCHANT enchant)

67
-            list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})

68
-            list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})

69
-            set(HAVE_ENCHANT TRUE)

70
-            if(${ENCHANT_VERSION} VERSION_GREATER "1.6")

71
-                set(HAVE_ENCHANT2 TRUE)

72
-            endif()

73
         endif()

74
     endif(PKG_CONFIG_FOUND)

75
     if(NOT ENCHANT_FOUND)

76


77


78