|
|
1a006c0 |
diff -rupN libkml-1.3.0/cmake/External_minizip.cmake libkml-1.3.0-new/cmake/External_minizip.cmake
|
|
|
1a006c0 |
--- libkml-1.3.0/cmake/External_minizip.cmake 2015-12-21 18:23:05.000000000 +0100
|
|
|
e8c04f8 |
+++ libkml-1.3.0-new/cmake/External_minizip.cmake 2018-10-06 21:50:30.785912329 +0200
|
|
|
e8c04f8 |
@@ -1,15 +1,18 @@
|
|
|
e8c04f8 |
+set(MINIZIP_INSTALL_DIR ${CMAKE_BINARY_DIR}/MINIZIP/install/include)
|
|
|
e8c04f8 |
+set(MINIZIP_BUILD_SHARED_LIBS FALSE)
|
|
|
1a006c0 |
+
|
|
|
1a006c0 |
ExternalProject_Add(MINIZIP
|
|
|
1a006c0 |
PREFIX MINIZIP
|
|
|
1a006c0 |
- URL "http://sourceforge.net/projects/libkml-files/files/1.3.0/minizip.tar.gz/download"
|
|
|
1a006c0 |
+ URL "${CMAKE_BINARY_DIR}/minizip-1.3.0.tar.gz"
|
|
|
1a006c0 |
URL_MD5 d5f74eff74e03e497ea60b2c43623416
|
|
|
1a006c0 |
BINARY_DIR ${CMAKE_BINARY_DIR}/MINIZIP/build
|
|
|
1a006c0 |
DEPENDS ${MINIZIP_DEPENDS}
|
|
|
1a006c0 |
- CMAKE_CACHE_ARGS
|
|
|
e8c04f8 |
- -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}
|
|
|
1a006c0 |
+ CMAKE_ARGS
|
|
|
e8c04f8 |
+ -DCMAKE_INSTALL_PREFIX:PATH=${MINIZIP_INSTALL_DIR}
|
|
|
1a006c0 |
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
|
|
1a006c0 |
-DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR}
|
|
|
e8c04f8 |
-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
|
|
|
e8c04f8 |
- -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} )
|
|
|
e8c04f8 |
+ -DBUILD_SHARED_LIBS:BOOL=${MINIZIP_BUILD_SHARED_LIBS} )
|
|
|
e8c04f8 |
|
|
|
e8c04f8 |
if(MSVC)
|
|
|
e8c04f8 |
include_project_vars(MINIZIP "minizip")
|
|
|
e8c04f8 |
diff -rupN libkml-1.3.0/cmake/LibKMLHelper.cmake libkml-1.3.0-new/cmake/LibKMLHelper.cmake
|
|
|
e8c04f8 |
--- libkml-1.3.0/cmake/LibKMLHelper.cmake 2015-12-21 18:23:05.000000000 +0100
|
|
|
e8c04f8 |
+++ libkml-1.3.0-new/cmake/LibKMLHelper.cmake 2018-10-06 21:52:17.978906400 +0200
|
|
|
e8c04f8 |
@@ -59,16 +59,16 @@ endfunction(build_example)
|
|
|
e8c04f8 |
|
|
|
e8c04f8 |
|
|
|
e8c04f8 |
macro(include_project_vars _project _lib)
|
|
|
e8c04f8 |
- set(${_project}_INCLUDE_DIR "${INSTALL_DIR}/include")
|
|
|
e8c04f8 |
+ set(${_project}_INCLUDE_DIR "${${_project}_INSTALL_DIR}/include")
|
|
|
e8c04f8 |
if(WIN32)
|
|
|
e8c04f8 |
set(_suffix ${CMAKE_LINK_LIBRARY_SUFFIX})
|
|
|
e8c04f8 |
else(UNIX)
|
|
|
e8c04f8 |
- if(BUILD_SHARED_LIBS)
|
|
|
e8c04f8 |
+ if(${${_project}_BUILD_SHARED_LIBS})
|
|
|
e8c04f8 |
set(_suffix ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
e8c04f8 |
else()
|
|
|
e8c04f8 |
set(_suffix ".a")
|
|
|
e8c04f8 |
endif()
|
|
|
e8c04f8 |
endif(WIN32)
|
|
|
e8c04f8 |
- set(${_project}_LIBRARY "${INSTALL_DIR}/lib/${_lib}${_suffix}")
|
|
|
e8c04f8 |
+ set(${_project}_LIBRARY "${${_project}_INSTALL_DIR}/lib/${_lib}${_suffix}")
|
|
|
e8c04f8 |
include_directories(${${_project}_INCLUDE_DIR})
|
|
|
e8c04f8 |
endmacro()
|