diff --git a/CMakeLists.txt b/CMakeLists.txt index 07a89a81..50b0b789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,7 @@ # Consult LICENSE.txt for licensing information. #----------------------------------------------------------------------------------------------------------------------- -if(CMAKE_MAJOR_VERSION VERSION_EQUAL "4") - cmake_minimum_required(VERSION 3.10) -else() - # for android builds - cmake_minimum_required(VERSION 3.4) -endif() +cmake_minimum_required(VERSION 3.10) project(PDFNetLanguageBindings CXX) diff --git a/PDFNetPHP/CMakeLists.txt b/PDFNetPHP/CMakeLists.txt index fde686bb..b7da450d 100644 --- a/PDFNetPHP/CMakeLists.txt +++ b/PDFNetPHP/CMakeLists.txt @@ -4,7 +4,8 @@ #----------------------------------------------------------------------------------------------------------------------- project(PDFNetPHP CXX) -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10) + find_program(PHP_CONFIG_EXECUTABLE NAMES php-config7 php-config5 php-config4 php-config) if (NOT PHP_CONFIG_EXECUTABLE) diff --git a/PDFNetRuby/CMakeLists.txt b/PDFNetRuby/CMakeLists.txt index c9f26cd0..a68b3613 100644 --- a/PDFNetRuby/CMakeLists.txt +++ b/PDFNetRuby/CMakeLists.txt @@ -3,8 +3,9 @@ # Consult LICENSE.txt for licensing information. #----------------------------------------------------------------------------------------------------------------------- +cmake_minimum_required(VERSION 3.10) + project(PDFNetRuby CXX) -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) # Checks the header and library directory of the current active ruby install # This will respond to virtual enviroments @@ -72,13 +73,7 @@ elseif (UNIX) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fPIC") if (APPLE) 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,.") - if(BUILD_MACOS_ARM64) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -target arm64-apple-macos11") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -target arm64-apple-macos11") - set(CMAKE_OSX_SYSROOT "/Applications/Xcode_12.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk") - else(BUILD_MACOS_ARM64) - set(CMAKE_OSX_SYSROOT "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk") - endif(BUILD_MACOS_ARM64) + set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") else () set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-rpath,'$ORIGIN'") endif () diff --git a/PDFTronGo/CMakeLists.txt b/PDFTronGo/CMakeLists.txt index eb67d30f..1b2f0d17 100644 --- a/PDFTronGo/CMakeLists.txt +++ b/PDFTronGo/CMakeLists.txt @@ -4,7 +4,7 @@ #----------------------------------------------------------------------------------------------------------------------- project(PDFTronGo CXX) -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10) find_program(GO_EXECUTABLE go PATHS $ENV{HOME}/go ENV GOROOT GOPATH PATH_SUFFIXES bin) if(GO_EXECUTABLE)