| @@ -1,18 +1,19 @@ | | | @@ -1,18 +1,19 @@ |
| 1 | $NetBSD: patch-CMakeLists.txt,v 1.1 2019/11/04 18:35:22 nros Exp $ | | 1 | $NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/04 18:53:13 nros Exp $ |
| 2 | | | 2 | |
| 3 | * sanitze the names and dirs to search for libs and headers files | | 3 | * sanitze the names and dirs to search for libs and headers files |
| 4 | * use PATH_SUFFIX fix to find openjpeg | | 4 | * use PATH_SUFFIX fix to find openjpeg |
| 5 | * install bins and data into the right directory | | 5 | * install bins and data into the right directory |
| | | 6 | * don't regenerate translations (no need for qttools dependecy) |
| 6 | * don't install cmake files in the translation directory | | 7 | * don't install cmake files in the translation directory |
| 7 | * install icon and desktop files | | 8 | * install icon and desktop files |
| 8 | * install hi-res maps | | 9 | * install hi-res maps |
| 9 | | | 10 | |
| 10 | --- CMakeLists.txt.orig 2019-07-05 09:01:01.000000000 +0000 | | 11 | --- CMakeLists.txt.orig 2019-07-05 09:01:01.000000000 +0000 |
| 11 | +++ CMakeLists.txt | | 12 | +++ CMakeLists.txt |
| 12 | @@ -54,71 +54,23 @@ find_package(Qt5Xml CONFIG REQUIRED) | | 13 | @@ -54,71 +54,23 @@ find_package(Qt5Xml CONFIG REQUIRED) |
| 13 | include_directories(${Qt5Xml_INCLUDE_DIRS}) | | 14 | include_directories(${Qt5Xml_INCLUDE_DIRS}) |
| 14 | | | 15 | |
| 15 | find_library(LIBNOVA_LIBRARY | | 16 | find_library(LIBNOVA_LIBRARY |
| 16 | - NAMES "libnova.a" "libnova.so" | | 17 | - NAMES "libnova.a" "libnova.so" |
| 17 | - PATHS | | 18 | - PATHS |
| 18 | - $ENV{EXTERNLIBS}/lib | | 19 | - $ENV{EXTERNLIBS}/lib |
| @@ -75,39 +76,54 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2019 | | | @@ -75,39 +76,54 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2019 |
| 75 | - /usr/local/include/openjpeg-2.1 | | 76 | - /usr/local/include/openjpeg-2.1 |
| 76 | - /usr/include/openjpeg-2.1 | | 77 | - /usr/include/openjpeg-2.1 |
| 77 | - /usr/local/include/openjpeg-2.2 | | 78 | - /usr/local/include/openjpeg-2.2 |
| 78 | - /usr/include/openjpeg-2.2 | | 79 | - /usr/include/openjpeg-2.2 |
| 79 | - /usr/include | | 80 | - /usr/include |
| 80 | - /sw/include # Fink | | 81 | - /sw/include # Fink |
| 81 | - /opt/local/include # DarwinPorts | | 82 | - /opt/local/include # DarwinPorts |
| 82 | - /opt/csw/include # Blastwave | | 83 | - /opt/csw/include # Blastwave |
| 83 | - /opt/include | | 84 | - /opt/include |
| 84 | + PATH_SUFFIXES openjpeg-2.3 | | 85 | + PATH_SUFFIXES openjpeg-2.3 |
| 85 | REQUIRED | | 86 | REQUIRED |
| 86 | ) | | 87 | ) |
| 87 | include_directories(${OPENJPEG_INCLUDE_DIR}) | | 88 | include_directories(${OPENJPEG_INCLUDE_DIR}) |
| 88 | @@ -222,8 +174,9 @@ set(PREFIX_PKGDATA ".") | | 89 | @@ -212,22 +164,18 @@ include_directories(${PNG_INCLUDE_DIR}) |
| | | 90 | configure_file(cmake/Version.h.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/Version.h) |
| | | 91 | include_directories(${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include) |
| | | 92 | |
| | | 93 | -if(APPLE) |
| | | 94 | -set(PREFIX_BIN ${PROJECT_NAME}) |
| | | 95 | -set(PREFIX_PKGDATA ${PROJECT_NAME}) |
| | | 96 | -endif() |
| | | 97 | if(WIN32) |
| | | 98 | set(PREFIX_BIN ".") |
| | | 99 | set(PREFIX_PKGDATA ".") |
| 89 | endif() | | 100 | endif() |
| 90 | if(UNIX AND NOT APPLE) | | 101 | -if(UNIX AND NOT APPLE) |
| | | 102 | +if(UNIX) |
| 91 | # This is not exactly a good idea on linux - the code should be changed so that the executable would go to /usr/local/bin and the data to /usr/local/share/XyGrib | | 103 | # This is not exactly a good idea on linux - the code should be changed so that the executable would go to /usr/local/bin and the data to /usr/local/share/XyGrib |
| 92 | -set(PREFIX_BIN ${PROJECT_NAME}) | | 104 | -set(PREFIX_BIN ${PROJECT_NAME}) |
| 93 | -set(PREFIX_PKGDATA ${PROJECT_NAME}) | | 105 | -set(PREFIX_PKGDATA ${PROJECT_NAME}) |
| 94 | +include(GNUInstallDirs) | | 106 | +include(GNUInstallDirs) |
| 95 | +set(PREFIX_BIN ${CMAKE_INSTALL_FULL_BINDIR}) | | 107 | +set(PREFIX_BIN ${CMAKE_INSTALL_FULL_BINDIR}) |
| 96 | +set(PREFIX_PKGDATA ${CMAKE_INSTALL_FULL_DATADIR}/openGribs/${PROJECT_NAME}) | | 108 | +set(PREFIX_PKGDATA ${CMAKE_INSTALL_FULL_DATADIR}/openGribs/${PROJECT_NAME}) |
| 97 | endif() | | 109 | endif() |
| 98 | | | 110 | |
| 99 | add_subdirectory(src) | | 111 | add_subdirectory(src) |
| 100 | @@ -241,4 +194,14 @@ set_target_properties(${PROJECT_NAME} PR | | 112 | -add_subdirectory(data/tr) |
| | | 113 | |
| | | 114 | # Installation |
| | | 115 | # macOS bundle parameters |
| | | 116 | @@ -241,4 +189,14 @@ set_target_properties(${PROJECT_NAME} PR |
| 101 | set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}") | | 117 | set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}") |
| 102 | set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors") | | 118 | set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors") |
| 103 | # Install data | | 119 | # Install data |
| 104 | -install(DIRECTORY data DESTINATION ${PREFIX_PKGDATA}) | | 120 | -install(DIRECTORY data DESTINATION ${PREFIX_PKGDATA}) |
| 105 | +install(DIRECTORY data DESTINATION ${PREFIX_PKGDATA} | | 121 | +install(DIRECTORY data DESTINATION ${PREFIX_PKGDATA} |
| 106 | + PATTERN "CMakeFiles" EXCLUDE | | 122 | + PATTERN "CMakeFiles" EXCLUDE |
| 107 | + PATTERN "CMakeLists.txt" EXCLUDE | | 123 | + PATTERN "CMakeLists.txt" EXCLUDE |
| 108 | + PATTERN "Makefile" EXCLUDE | | 124 | + PATTERN "Makefile" EXCLUDE |
| 109 | + PATTERN "cmake_install.cmake" EXCLUDE | | 125 | + PATTERN "cmake_install.cmake" EXCLUDE |
| 110 | + PATTERN "*.ts" EXCLUDE) | | 126 | + PATTERN "*.ts" EXCLUDE) |
| 111 | +install(FILES debian/xygrib.desktop | | 127 | +install(FILES debian/xygrib.desktop |
| 112 | + DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications) | | 128 | + DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications) |
| 113 | +install(FILES debian/xygrib.png | | 129 | +install(FILES debian/xygrib.png |