3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert CMAKE_FIND_PACKAGE_PREFER_CONFIG as its from cmake > 3.13

Browse Source 
Do the overriding in the appropriate find modules in cmake/modules
This commit is contained in:
tamasmeszaros 2022-05-23 10:55:23 +02:00 committed by Lukas Matena
parent e2007e41ba
commit c316a9f3e3
2 changed files with 89 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -42,14 +42,6 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
set(IS_CROSS_COMPILE FALSE) set(IS_CROSS_COMPILE FALSE)
if (SLIC3R_STATIC)
# Prefer config scripts over find modules. This is helpful when building with
# the static dependencies. Many libraries have their own export scripts
# while having a Find<PkgName> module in standard cmake installation.
# (e.g. CURL)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
endif ()
if (APPLE) if (APPLE)
set(CMAKE_FIND_FRAMEWORK LAST) set(CMAKE_FIND_FRAMEWORK LAST)
set(CMAKE_FIND_APPBUNDLE LAST) set(CMAKE_FIND_APPBUNDLE LAST)
@ -425,19 +417,10 @@ if (NOT EIGEN3_FOUND)
endif () endif ()
include_directories(BEFORE SYSTEM ${EIGEN3_INCLUDE_DIR}) include_directories(BEFORE SYSTEM ${EIGEN3_INCLUDE_DIR})
# Find expat or use bundled version # Find expat. We have our overriden FindEXPAT which exports libexpat target
# Always use the system libexpat on Linux. # no matter what.
find_package(EXPAT REQUIRED) find_package(EXPAT REQUIRED)
add_library(libexpat INTERFACE)
if (TARGET EXPAT::EXPAT )
target_link_libraries(libexpat INTERFACE EXPAT::EXPAT)
elseif(TARGET expat::expat)
target_link_libraries(libexpat INTERFACE expat::expat)
endif ()
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
set(OpenGL_GL_PREFERENCE "LEGACY") set(OpenGL_GL_PREFERENCE "LEGACY")

41
cmake/modules/FindCURL.cmake
View File

@ -30,11 +30,28 @@
# ``CURL_VERSION_STRING`` # ``CURL_VERSION_STRING``
# The version of curl found. # The version of curl found.
# Look for the header file. # First, prefer config scripts
find_path(CURL_INCLUDE_DIR NAMES curl/curl.h) set(_q "")
mark_as_advanced(CURL_INCLUDE_DIR) if(CURL_FIND_QUIETLY)
set(_q QUIET)
endif()
find_package(CURL ${CURL_FIND_VERSION} CONFIG ${_q})
if(NOT CURL_LIBRARY) if(NOT CURL_FIND_QUIETLY)
if (NOT CURL_FOUND)
message(STATUS "Falling back to MODULE search for CURL...")
else()
message(STATUS "CURL found in ${CURL_DIR}")
endif()
endif()
if (NOT CURL_FOUND)
# Look for the header file.
find_path(CURL_INCLUDE_DIR NAMES curl/curl.h)
mark_as_advanced(CURL_INCLUDE_DIR)
if(NOT CURL_LIBRARY)
# Look for the library (sorted from most current/relevant entry to least). # Look for the library (sorted from most current/relevant entry to least).
find_library(CURL_LIBRARY_RELEASE NAMES find_library(CURL_LIBRARY_RELEASE NAMES
curl curl
@ -60,9 +77,9 @@ if(NOT CURL_LIBRARY)
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations_SLIC3R.cmake) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations_SLIC3R.cmake)
select_library_configurations_SLIC3R(CURL) select_library_configurations_SLIC3R(CURL)
endif() endif()
if(CURL_INCLUDE_DIR) if(CURL_INCLUDE_DIR)
foreach(_curl_version_header curlver.h curl.h) foreach(_curl_version_header curlver.h curl.h)
if(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}") if(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}")
file(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"") file(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"")
@ -72,14 +89,14 @@ if(CURL_INCLUDE_DIR)
break() break()
endif() endif()
endforeach() endforeach()
endif() endif()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs_SLIC3R.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs_SLIC3R.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS_SLIC3R(CURL FIND_PACKAGE_HANDLE_STANDARD_ARGS_SLIC3R(CURL
REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR
VERSION_VAR CURL_VERSION_STRING) VERSION_VAR CURL_VERSION_STRING)
if(CURL_FOUND) if(CURL_FOUND)
set(CURL_LIBRARIES ${CURL_LIBRARY}) set(CURL_LIBRARIES ${CURL_LIBRARY})
set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR}) set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
@ -108,4 +125,6 @@ if(CURL_FOUND)
IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}") IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}")
endif() endif()
endif() endif()
endif() endif()
endif (NOT CURL_FOUND)