Skip to content

Commit 1ec58e4

Browse files
authored
Update to 11.7 Apryse SDK (#171)
1 parent aea3619 commit 1ec58e4

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
if(CMAKE_MAJOR_VERSION VERSION_EQUAL "4")
77
cmake_minimum_required(VERSION 3.10)
88
else()
9-
# for android builds
109
cmake_minimum_required(VERSION 3.4)
1110
endif()
1211

PDFNetPHP/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
project(PDFNetPHP CXX)
77
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
88

9+
910
find_program(PHP_CONFIG_EXECUTABLE NAMES php-config7 php-config5 php-config4 php-config)
1011
if (NOT PHP_CONFIG_EXECUTABLE)
1112
message(FATAL_ERROR "Cannot find php-config, please set the variable PHP_CONFIG_EXECUTABLE to the location of php-config then try again.")

PDFNetPython/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
# Consult LICENSE.txt for licensing information.
44
#-----------------------------------------------------------------------------------------------------------------------
55

6-
cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
6+
if(CMAKE_MAJOR_VERSION VERSION_EQUAL "4")
7+
cmake_minimum_required(VERSION 3.10)
8+
else()
9+
cmake_minimum_required(VERSION 3.4)
10+
endif()
11+
712

813
if (APPLE)
914
set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)

PDFNetRuby/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,7 @@ elseif (UNIX)
7272
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fPIC")
7373
if (APPLE)
7474
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-headerpad_max_install_names -lSystem -undefined dynamic_lookup -Wl,-install_name,@rpath/PDFNetRuby.bundle -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/local/lib -Wl,-rpath,.")
75-
if(BUILD_MACOS_ARM64)
76-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -target arm64-apple-macos11")
77-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -target arm64-apple-macos11")
78-
set(CMAKE_OSX_SYSROOT "/Applications/Xcode_12.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk")
79-
else(BUILD_MACOS_ARM64)
80-
set(CMAKE_OSX_SYSROOT "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk")
81-
endif(BUILD_MACOS_ARM64)
82-
else ()
83-
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-rpath,'$ORIGIN'")
75+
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
8476
endif ()
8577
endif ()
8678

PDFTronGo/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
#-----------------------------------------------------------------------------------------------------------------------
55

66
project(PDFTronGo CXX)
7-
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
7+
if(CMAKE_MAJOR_VERSION VERSION_EQUAL "4")
8+
cmake_minimum_required(VERSION 3.10)
9+
else()
10+
cmake_minimum_required(VERSION 3.4)
11+
endif()
812

913
find_program(GO_EXECUTABLE go PATHS $ENV{HOME}/go ENV GOROOT GOPATH PATH_SUFFIXES bin)
1014
if(GO_EXECUTABLE)

Samples/OfficeTemplateTest/PYTHON/OfficeTemplateTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def main():
5757
template_doc = Convert.CreateOfficeTemplate(input_path + input_filename, None)
5858

5959
# Fill the template with data from a JSON string, producing a PDF document.
60-
pdfdoc = template_doc.FillTemplateJson(json);
60+
pdfdoc = template_doc.FillTemplateJson(json)
6161

6262
# Save the PDF to a file.
6363
pdfdoc.Save(output_path + output_filename, SDFDoc.e_linearized)

0 commit comments

Comments
 (0)