mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 04:19:07 +08:00
25eb51a36b
* Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
22 lines
696 B
Diff
22 lines
696 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index dc146d1..9b82544 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -140,7 +140,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
|
|
|
|
configure_file(
|
|
"${PROJECT_SOURCE_DIR}/gitsha.cpp.in"
|
|
- "${PROJECT_SOURCE_DIR}/pdal/gitsha.cpp")
|
|
+ "${PROJECT_BINARY_DIR}/pdal/gitsha.cpp")
|
|
|
|
# needs to come before configuration of pdal_features
|
|
if(APPLE)
|
|
@@ -201,6 +201,7 @@ file(GLOB BASE_SRCS
|
|
${PDAL_IO_DIR}/*.cpp
|
|
${PDAL_KERNELS_DIR}/*.cpp
|
|
${PDAL_SRC_DIR}/*.cpp
|
|
+ ${PROJECT_BINARY_DIR}/pdal/gitsha.cpp
|
|
${PDAL_SRC_DIR}/compression/*.cpp)
|
|
file(GLOB_RECURSE PRIVATE_SRCS
|
|
${PDAL_FILTERS_DIR}/private/*.cpp
|