Skip to content

Commit

Permalink
[lzma] put symbols in cmake cache
Browse files Browse the repository at this point in the history
  • Loading branch information
cenit committed Apr 24, 2019
1 parent 4658946 commit ea77d3c
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 19 deletions.
2 changes: 2 additions & 0 deletions ports/libgta/portfile.cmake
Expand Up @@ -12,6 +12,8 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${LIBGTA_VERSION}
PATCHES
use_lzma_config.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIBS)
Expand Down
13 changes: 13 additions & 0 deletions ports/libgta/use_lzma_config.patch
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8e0307..10ccf18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ endif()
# Main target: libgta
find_package(ZLIB REQUIRED)
find_package(BZip2 REQUIRED)
-find_package(LibLZMA REQUIRED)
+find_package(LibLZMA CONFIG REQUIRED)
configure_file("${CMAKE_SOURCE_DIR}/src/gta/gta_version.h.in" "${CMAKE_BINARY_DIR}/src/gta/gta_version.h" @ONLY)
include_directories("${ZLIB_INCLUDE_DIRS}" "${BZIP2_INCLUDE_DIR}" "${LIBLZMA_INCLUDE_DIRS}"
"${CMAKE_SOURCE_DIR}/src" "${CMAKE_BINARY_DIR}/src")
8 changes: 5 additions & 3 deletions ports/liblzma/CMakeLists.txt
Expand Up @@ -3,7 +3,7 @@ project(LibLZMA)

set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed")
set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed")
set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed")
set(INSTALL_INCLUDE_DIR "include/lzma" CACHE PATH "Path where headers will be installed")
set(INSTALL_CMAKE_DIR "share/liblzma" CACHE PATH "Path where cmake configs will be installed")
set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Append a suffix to debug libraries")

Expand Down Expand Up @@ -137,7 +137,8 @@ else()
endif()

if(BUILD_SHARED_LIBS)
target_compile_definitions(LZMA PRIVATE -DLIBLZMADLL_EXPORTS -DDLL_EXPORT)
target_compile_definitions(LZMA PRIVATE -DDLL_EXPORT)
target_compile_definitions(LZMA PUBLIC -DLIBLZMADLL_EXPORTS)
else()
target_compile_definitions(LZMA PUBLIC -DLZMA_API_STATIC)
endif()
Expand All @@ -154,6 +155,7 @@ target_include_directories(LZMA PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/simple>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/lzma>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/api>
$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}/lzma>
)

Expand All @@ -165,7 +167,7 @@ install(TARGETS LZMA EXPORT LibLZMATargets
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/lzma"
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
)

install(FILES "${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma.h"
Expand Down
26 changes: 13 additions & 13 deletions ports/liblzma/portfile.cmake
Expand Up @@ -33,16 +33,16 @@ if(NOT LibLZMA_LIBRARY)
find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAD LZMAd PATHS \${_IMPORT_PREFIX}/debug/lib/)
select_library_configurations(LibLZMA)
endif()
set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR})
set(LibLZMA_LIBRARIES \${LibLZMA_LIBRARY})
set(LZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR})
set(LZMA_LIBRARY \${LibLZMA_LIBRARY})
set(LZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR})
set(LZMA_LIBRARIES \${LibLZMA_LIBRARY})
set(LIBLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR})
set(LIBLZMA_LIBRARIES \${LibLZMA_LIBRARY})
set(LIBLZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR})
set(LIBLZMA_LIBRARY \${LibLZMA_LIBRARY})
set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
set(LibLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
set(LZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
set(LZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\")
set(LZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
set(LZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
set(LIBLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
set(LIBLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
set(LIBLZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
set(LIBLZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\")
if(LIBLZMA_INCLUDE_DIR AND EXISTS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\")
file(STRINGS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\" LIBLZMA_HEADER_CONTENTS REGEX \"#define LZMA_VERSION_[A-Z]+ [0-9]+\")
Expand All @@ -65,9 +65,9 @@ if (LIBLZMA_LIBRARY)
CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_lzma_preset \"\" LIBLZMA_HAS_LZMA_PRESET)
endif ()
set(LibLZMA_FOUND TRUE)
set(LZMA_FOUND TRUE)
set(LIBLZMA_FOUND TRUE)
set(LibLZMA_FOUND TRUE CACHE BOOL \"\")
set(LZMA_FOUND TRUE CACHE BOOL \"\")
set(LIBLZMA_FOUND TRUE CACHE BOOL \"\")
")

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
Expand Down
6 changes: 3 additions & 3 deletions ports/libspatialite/portfile.cmake
Expand Up @@ -33,10 +33,10 @@ else()
set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib")
set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib")
set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib ws2_32.lib")
set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
endif()

set(LIBS_ALL_DBG
set(LIBS_ALL_DBG
"${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \
${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \
${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \
Expand All @@ -46,7 +46,7 @@ set(LIBS_ALL_DBG
${GEOS_LIBS_DBG} \
${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib"
)
set(LIBS_ALL_REL
set(LIBS_ALL_REL
"${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \
${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \
${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \
Expand Down

0 comments on commit ea77d3c

Please sign in to comment.