From 4ff01abf49d5e8fd1df6c3552971b0c2a02b2f87 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Wed, 22 Jul 2015 11:04:01 +0200
Subject: [PATCH] BUG: libkml base and uriparser dependency
---
SuperBuild/CMake/External_libkml.cmake | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/SuperBuild/CMake/External_libkml.cmake b/SuperBuild/CMake/External_libkml.cmake
index 498b8fdf70..fae829c61b 100644
--- a/SuperBuild/CMake/External_libkml.cmake
+++ b/SuperBuild/CMake/External_libkml.cmake
@@ -11,15 +11,15 @@ if(USE_SYSTEM_LIBKML)
else()
SETUP_SUPERBUILD(PROJECT ${proj})
message(STATUS " Using libKML SuperBuild version")
-
+
# declare dependencies
##set(${proj}_DEPENDENCIES EXPAT ZLIB BOOST)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} EXPAT ZLIB BOOST)
-
+
INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
# set proj back to its original value
set(proj LIBKML)
-
+
ADD_SUPERBUILD_CMAKE_VAR(EXPAT_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(EXPAT_LIBRARY)
ADD_SUPERBUILD_CMAKE_VAR(ZLIB_INCLUDE_DIR)
@@ -34,7 +34,7 @@ else()
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
DEPENDS ${${proj}_DEPENDENCIES}
- PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj} ${LIBKML_SB_SRC}
+ PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj} ${LIBKML_SB_SRC}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE:STRING=Release
@@ -43,14 +43,17 @@ else()
${LIBKML_SB_CONFIG}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
-
+
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
+ list(APPEND _SB_${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlbase.lib)
if(USE_SYSTEM_EXPAT)
- set(_SB_${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlbase.lib;${EXPAT_LIBRARY})
+ list(APPEND _SB_${proj}_BASE_LIBRARY ${EXPAT_LIBRARY})
else()
- set(_SB_${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlbase.lib;${_SB_EXPAT_LIBRARY})
+ list(APPEND _SB_${proj}_BASE_LIBRARY ${_SB_EXPAT_LIBRARY})
endif()
+ list(APPEND _SB_${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/uriparser.lib)
+
set(_SB_${proj}_CONVENIENCE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlconvenience.lib)
set(_SB_${proj}_DOM_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmldom.lib)
set(_SB_${proj}_ENGINE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlengine.lib)
@@ -66,6 +69,6 @@ else()
set(_SB_${proj}_XSD_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlxsd${CMAKE_SHARED_LIBRARY_SUFFIX})
set(_SB_${proj}_MINIZIP_LIBRARY ${SB_INSTALL_PREFIX}/lib/libminizip${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
-
+
endif()
endif()
--
GitLab