Revert CMAKE_FIND_PACKAGE_PREFER_CONFIG as its from cmake > 3.13
Do the overriding in the appropriate find modules in cmake/modules
This commit is contained in:
tamasmeszaros
parent
6365e54b1f
commit
f8ec5fc9e7
@ -43,14 +43,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)
|
||||||
@ -458,19 +450,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")
|
||||||
|
|||||||
@ -30,82 +30,101 @@
|
|||||||
# ``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)
|
||||||
# Look for the library (sorted from most current/relevant entry to least).
|
if (NOT CURL_FOUND)
|
||||||
find_library(CURL_LIBRARY_RELEASE NAMES
|
message(STATUS "Falling back to MODULE search for CURL...")
|
||||||
curl
|
else()
|
||||||
# Windows MSVC prebuilts:
|
message(STATUS "CURL found in ${CURL_DIR}")
|
||||||
curllib
|
endif()
|
||||||
libcurl_imp
|
|
||||||
curllib_static
|
|
||||||
# Windows older "Win32 - MSVC" prebuilts (libcurl.lib, e.g. libcurl-7.15.5-win32-msvc.zip):
|
|
||||||
libcurl
|
|
||||||
# Static library on Windows
|
|
||||||
libcurl_a
|
|
||||||
)
|
|
||||||
mark_as_advanced(CURL_LIBRARY_RELEASE)
|
|
||||||
|
|
||||||
find_library(CURL_LIBRARY_DEBUG NAMES
|
|
||||||
# Windows MSVC CMake builds in debug configuration on vcpkg:
|
|
||||||
libcurl-d_imp
|
|
||||||
libcurl-d
|
|
||||||
# Static library on Windows, compiled in debug mode
|
|
||||||
libcurl_a_debug
|
|
||||||
)
|
|
||||||
mark_as_advanced(CURL_LIBRARY_DEBUG)
|
|
||||||
|
|
||||||
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations_SLIC3R.cmake)
|
|
||||||
select_library_configurations_SLIC3R(CURL)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CURL_INCLUDE_DIR)
|
if (NOT CURL_FOUND)
|
||||||
foreach(_curl_version_header curlver.h curl.h)
|
|
||||||
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 ]+\".*\"")
|
|
||||||
|
|
||||||
string(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}")
|
# Look for the header file.
|
||||||
unset(curl_version_str)
|
find_path(CURL_INCLUDE_DIR NAMES curl/curl.h)
|
||||||
break()
|
mark_as_advanced(CURL_INCLUDE_DIR)
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs_SLIC3R.cmake)
|
if(NOT CURL_LIBRARY)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS_SLIC3R(CURL
|
# Look for the library (sorted from most current/relevant entry to least).
|
||||||
REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR
|
find_library(CURL_LIBRARY_RELEASE NAMES
|
||||||
VERSION_VAR CURL_VERSION_STRING)
|
curl
|
||||||
|
# Windows MSVC prebuilts:
|
||||||
|
curllib
|
||||||
|
libcurl_imp
|
||||||
|
curllib_static
|
||||||
|
# Windows older "Win32 - MSVC" prebuilts (libcurl.lib, e.g. libcurl-7.15.5-win32-msvc.zip):
|
||||||
|
libcurl
|
||||||
|
# Static library on Windows
|
||||||
|
libcurl_a
|
||||||
|
)
|
||||||
|
mark_as_advanced(CURL_LIBRARY_RELEASE)
|
||||||
|
|
||||||
if(CURL_FOUND)
|
find_library(CURL_LIBRARY_DEBUG NAMES
|
||||||
set(CURL_LIBRARIES ${CURL_LIBRARY})
|
# Windows MSVC CMake builds in debug configuration on vcpkg:
|
||||||
set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
|
libcurl-d_imp
|
||||||
|
libcurl-d
|
||||||
|
# Static library on Windows, compiled in debug mode
|
||||||
|
libcurl_a_debug
|
||||||
|
)
|
||||||
|
mark_as_advanced(CURL_LIBRARY_DEBUG)
|
||||||
|
|
||||||
if(NOT TARGET CURL::libcurl)
|
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations_SLIC3R.cmake)
|
||||||
add_library(CURL::libcurl UNKNOWN IMPORTED)
|
select_library_configurations_SLIC3R(CURL)
|
||||||
set_target_properties(CURL::libcurl PROPERTIES
|
endif()
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
|
|
||||||
|
|
||||||
if(EXISTS "${CURL_LIBRARY}")
|
if(CURL_INCLUDE_DIR)
|
||||||
|
foreach(_curl_version_header curlver.h curl.h)
|
||||||
|
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 ]+\".*\"")
|
||||||
|
|
||||||
|
string(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}")
|
||||||
|
unset(curl_version_str)
|
||||||
|
break()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs_SLIC3R.cmake)
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS_SLIC3R(CURL
|
||||||
|
REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR
|
||||||
|
VERSION_VAR CURL_VERSION_STRING)
|
||||||
|
|
||||||
|
if(CURL_FOUND)
|
||||||
|
set(CURL_LIBRARIES ${CURL_LIBRARY})
|
||||||
|
set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
|
||||||
|
|
||||||
|
if(NOT TARGET CURL::libcurl)
|
||||||
|
add_library(CURL::libcurl UNKNOWN IMPORTED)
|
||||||
set_target_properties(CURL::libcurl PROPERTIES
|
set_target_properties(CURL::libcurl PROPERTIES
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
|
||||||
IMPORTED_LOCATION "${CURL_LIBRARY}")
|
|
||||||
endif()
|
if(EXISTS "${CURL_LIBRARY}")
|
||||||
if(CURL_LIBRARY_RELEASE)
|
set_target_properties(CURL::libcurl PROPERTIES
|
||||||
set_property(TARGET CURL::libcurl APPEND PROPERTY
|
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
||||||
IMPORTED_CONFIGURATIONS RELEASE)
|
IMPORTED_LOCATION "${CURL_LIBRARY}")
|
||||||
set_target_properties(CURL::libcurl PROPERTIES
|
endif()
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
if(CURL_LIBRARY_RELEASE)
|
||||||
IMPORTED_LOCATION_RELEASE "${CURL_LIBRARY_RELEASE}")
|
set_property(TARGET CURL::libcurl APPEND PROPERTY
|
||||||
endif()
|
IMPORTED_CONFIGURATIONS RELEASE)
|
||||||
if(CURL_LIBRARY_DEBUG)
|
set_target_properties(CURL::libcurl PROPERTIES
|
||||||
set_property(TARGET CURL::libcurl APPEND PROPERTY
|
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
||||||
IMPORTED_CONFIGURATIONS DEBUG)
|
IMPORTED_LOCATION_RELEASE "${CURL_LIBRARY_RELEASE}")
|
||||||
set_target_properties(CURL::libcurl PROPERTIES
|
endif()
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
if(CURL_LIBRARY_DEBUG)
|
||||||
IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}")
|
set_property(TARGET CURL::libcurl APPEND PROPERTY
|
||||||
|
IMPORTED_CONFIGURATIONS DEBUG)
|
||||||
|
set_target_properties(CURL::libcurl PROPERTIES
|
||||||
|
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
||||||
|
IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
endif (NOT CURL_FOUND)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user