-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update laszip to v3.4.4 * Set proper license based on version * Remove hardcoded mincppstd * typo * newline at eof of patch --------- Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
- Loading branch information
Showing
6 changed files
with
71 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
recipes/laszip/all/patches/0001-3.4.4-no-build-laszip-api.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- a/dll/CMakeLists.txt | ||
+++ b/dll/CMakeLists.txt | ||
@@ -2,5 +2,4 @@ set(LASZIP_API_SOURCES | ||
laszip_api.c | ||
) | ||
|
||
-LASZIP_ADD_LIBRARY(${LASZIP_API_LIB_NAME} ${LASZIP_API_SOURCES}) | ||
LASZIP_ADD_INCLUDES("laszip" "${CMAKE_CURRENT_SOURCE_DIR}/laszip_api.h" ${LASZIP_API_VERSION_H}) |
29 changes: 29 additions & 0 deletions
29
recipes/laszip/all/patches/0002-3.4.4-no-rpath-and-relocatable-macos.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -81,15 +81,11 @@ file(MAKE_DIRECTORY "${LASZIP_OUTPUT_BIN_DIR}") | ||
# per http://www.cmake.org/Wiki/CMake_RPATH_handling | ||
SET(CMAKE_SKIP_BUILD_RPATH FALSE) | ||
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) | ||
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) | ||
IF (APPLE) | ||
SET(MACOSX_RPATH ON) | ||
endif() | ||
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES | ||
"${CMAKE_INSTALL_PREFIX}/${LASZIP_LIB_INSTALL_DIR}" isSystemDir) | ||
-IF("${isSystemDir}" STREQUAL "-1") | ||
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LASZIP_LIB_INSTALL_DIR}") | ||
-ENDIF("${isSystemDir}" STREQUAL "-1") | ||
|
||
# wipe lib/ drectory on clean. It will have plugins that could be out of date | ||
# in the next build | ||
--- a/cmake/macros.cmake | ||
+++ b/cmake/macros.cmake | ||
@@ -71,8 +71,6 @@ macro(LASZIP_ADD_LIBRARY _name) | ||
LIBRARY DESTINATION ${LASZIP_LIB_INSTALL_DIR} | ||
ARCHIVE DESTINATION ${LASZIP_LIB_INSTALL_DIR}) | ||
if (APPLE) | ||
- set_target_properties(${_name} PROPERTIES INSTALL_NAME_DIR | ||
- "@executable_path/../lib") | ||
endif() | ||
endmacro(LASZIP_ADD_LIBRARY) | ||
|
12 changes: 12 additions & 0 deletions
12
recipes/laszip/all/patches/0003-3.4.4-remove-cppstd-hardcode.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 4b0a02b..a9cc6b5 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1,7 +1,6 @@ | ||
cmake_minimum_required(VERSION 3.10) | ||
|
||
project(LASZIP CXX C) | ||
-set(CMAKE_CXX_STANDARD 17) | ||
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) | ||
|
||
set(ROOT_DIR "${PROJECT_SOURCE_DIR}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
versions: | ||
"3.4.4": | ||
folder: all | ||
"3.4.3": | ||
folder: all |