Commit 1ec23f7a authored by Rashad Kanavath's avatar Rashad Kanavath

PKG: fix include windows sdk ucrt libs in binary package

parent 16ef5efd
macro(OTB_CHECK_TARGET_SYSTEM_ARCH _RESULT1 _RESULT2)
set(${_RESULT1} "x64")
set(${_RESULT2} TRUE)
if(MSVC)
execute_process(
COMMAND ${CMAKE_C_COMPILER}
ERROR_VARIABLE ev
OUTPUT_VARIABLE ov
OUTPUT_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if("${ev}" MATCHES "x86")
set(${_RESULT1} "x86")
set(${_RESULT2} FALSE)
endif()
endif() #MSVC
if(UNIX)
execute_process(
COMMAND uname -m
ERROR_VARIABLE ev
OUTPUT_VARIABLE ov
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(${_RESULT1} "${ov}")
set(${_RESULT2} FALSE)
if("${ov}" STREQUAL "x86_64")
set(${_RESULT2} TRUE)
endif()
endif()
if(WIN32 AND NOT MSVC)
if(MXE_TARGET_DIR)
if(MXE_TARGET_DIR MATCHES "i686")
set(${_RESULT1} "i686")
set(${_RESULT2} FALSE)
elseif(MXE_TARGET_DIR MATCHES "x86_64")
set(${_RESULT1} "x86_64")
set(${_RESULT2} TRUE)
endif()
else()
message(STATUS "MXE_TARGET_DIR not set!")
endif()
endif()
endmacro()
#call macro
OTB_CHECK_TARGET_SYSTEM_ARCH(OTB_TARGET_SYSTEM_ARCH OTB_TARGET_SYSTEM_ARCH_IS_X64)
......@@ -5,8 +5,7 @@ SETUP_SUPERBUILD(BOOST)
set(_SB_BOOST_LIBRARYDIR ${SB_INSTALL_PREFIX}/lib)
set(BOOST_SB_CONFIG)
if(OTB_COMPILER_ARCH_IS_X64)
if(OTB_TARGET_SYSTEM_ARCH_IS_X64)
set(BOOST_SB_CONFIG address-model=64)
endif()
......
......@@ -15,7 +15,7 @@ if(MSVC)
return()
endif()
if(OTB_COMPILER_ARCH_IS_X64)
if(OTB_TARGET_SYSTEM_ARCH_IS_X64)
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x64")
else()
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x86")
......
......@@ -95,7 +95,7 @@ else(MSVC)
${CMAKE_SOURCE_DIR}/patches/GDAL/nmake_gdal_extra.opt.in
${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt)
if(OTB_COMPILER_ARCH_IS_X64)
if(OTB_TARGET_SYSTEM_ARCH_IS_X64)
file(APPEND "${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt" "WIN64=YES")
endif()
......
......@@ -14,6 +14,8 @@ include(ExternalProject)
include(OTBCheckCpp11Keywords)
include(OTBCheckTargetSystemArch)
option(BUILD_SHARED_LIBS "Build OTB with shared libraries." ON)
set(OTB_ADDITIONAL_CACHE "" CACHE STRING "Additional cmake option for OTB -DVAR:TYPE=VALUE ...")
......@@ -25,40 +27,6 @@ if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
endif()
set(OTB_COMPILER_ARCH_IS_X64 TRUE)
if(MSVC)
execute_process(
COMMAND ${CMAKE_C_COMPILER}
ERROR_VARIABLE ev
OUTPUT_VARIABLE ov
OUTPUT_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(OTB_COMPILER_ARCH_IS_X64 TRUE)
set(OTB_COMPILER_ARCH x64)
if("${ev}" MATCHES "x86")
set(OTB_COMPILER_ARCH x86)
set(OTB_COMPILER_ARCH_IS_X64 FALSE)
endif()
endif() #MSVC
if(UNIX)
execute_process(
COMMAND uname -m
ERROR_VARIABLE ev
OUTPUT_VARIABLE ov
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(OTB_COMPILER_ARCH ${ov})
set(OTB_COMPILER_ARCH_IS_X64 FALSE)
if("${ov}" STREQUAL "x86_64")
set(OTB_COMPILER_ARCH_IS_X64 TRUE)
endif()
endif()
# use, i.e. don't skip the full RPATH for the build tree
set(CMAKE_SKIP_BUILD_RPATH FALSE)
# when building, don't use the install RPATH already
......@@ -350,6 +318,9 @@ if(FROM_SUPERBUILD_LIST)
endforeach()
endif()
message(STATUS "OTB_TARGET_SYSTEM_ARCH=[${OTB_TARGET_SYSTEM_ARCH}]\n")
message(STATUS "OTB_TARGET_SYSTEM_ARCH_IS_X64=[${OTB_TARGET_SYSTEM_ARCH_IS_X64}]\n")
message(STATUS "SuperBuild will be installed to ${CMAKE_INSTALL_PREFIX}")
message(STATUS "To install to a different directory, re-run cmake -DCMAKE_INSTALL_PREFIX=/your/preferred/path")
......@@ -4,25 +4,22 @@
# stop generation of msvc packages for windows. 04-apr-2016. point OTB.
##### check if standalone project ######
set(PACKAGE_OTB_SRC_DIR)
set(OUT_OF_SOURCE_BUILD FALSE)
if(NOT PROJECT_NAME)
cmake_minimum_required(VERSION 2.6)
include(CMakeParseArguments)
project(OTBPackaging)
option(GENERATE_PACKAGE "Generate OTB package" OFF)
option(GENERATE_PACKAGE "Generate OTB package" ON)
option(GENERATE_XDK "Generate XDK for OTB development" OFF)
endif()
if(PROJECT_NAME STREQUAL "OTB-SuperBuild")
if(NOT PACKAGE_OTB_SRC_DIR)
get_filename_component(PACKAGE_OTB_SRC_DIR ${OTB-SuperBuild_SOURCE_DIR} PATH)
endif()
endif()
set(OUT_OF_SOURCE_BUILD FALSE)
if(PROJECT_NAME STREQUAL "OTBPackaging")
set(OUT_OF_SOURCE_BUILD TRUE)
set(GENERATE_PACKAGE ON)
if(BUILD_TESTING)
include(CTest)
endif()
if(NOT PACKAGE_OTB_SRC_DIR)
get_filename_component(PACKAGE_OTB_SRC_DIR ${OTBPackaging_SOURCE_DIR} PATH)
get_filename_component(PACKAGE_OTB_SRC_DIR ${PACKAGE_OTB_SRC_DIR} PATH)
......@@ -32,7 +29,30 @@ if(PROJECT_NAME STREQUAL "OTBPackaging")
if(OTB_WRAP_PYTHON AND NOT PYTHON_EXECUTABLE)
find_package ( PythonInterp REQUIRED )
endif()
endif() #if(PROJECT_NAME STREQUAL ..
if(WIN32 AND NOT MSVC)
set(OTB_BINARY_DIR "" CACHE PATH "OTB binary directory")
set(OTB_INSTALL_DIR "" CACHE PATH "OTB install directory")
else()
set(SUPERBUILD_BINARY_DIR "" CACHE PATH "path to superbuild binary directory")
set(SUPERBUILD_INSTALL_DIR "" CACHE PATH "path to superbuild install directory")
set(DOWNLOAD_LOCATION "" CACHE PATH "path to superbuild download archives")
endif()
else() #if(NOT PROJECT_NAME)
# SUPERBUILD_BINARY_DIR is only set in Packaging/CMakeLists.txt and not available
# in the parent scope like others. So we need to set it as CMAKE_BINARY_DIR
# if doing packages from source tree.
set( SUPERBUILD_BINARY_DIR ${CMAKE_BINARY_DIR} )
set( SUPERBUILD_INSTALL_DIR ${SB_INSTALL_PREFIX} )
set( OTB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX} )
if(NOT PACKAGE_OTB_SRC_DIR)
get_filename_component(PACKAGE_OTB_SRC_DIR ${OTB-SuperBuild_SOURCE_DIR} PATH)
endif()
endif()
if(NOT GENERATE_PACKAGE AND NOT GENERATE_XDK)
#well. we don't have any businees here. Let's move on..
......@@ -51,88 +71,65 @@ endif()
set(SUPERBUILD_SOURCE_DIR ${PACKAGE_OTB_SRC_DIR}/SuperBuild)
include(${SUPERBUILD_SOURCE_DIR}/CMake/SuperBuild_Macro.cmake)
include(${PACKAGE_OTB_SRC_DIR}/CMake/OTBCheckTargetSystemArch.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/PMacros.cmake)
if(OUT_OF_SOURCE_BUILD)
include(${SUPERBUILD_SOURCE_DIR}/CMake/SuperBuild_Macro.cmake)
if(BUILD_TESTING)
include(CTest)
endif()
if(WIN32 AND NOT MSVC)
set(OTB_BINARY_DIR "" CACHE PATH "OTB binary directory")
set(OTB_INSTALL_DIR "" CACHE PATH "OTB install directory")
else()
set(SUPERBUILD_BINARY_DIR "" CACHE PATH "path to superbuild binary directory")
set(SUPERBUILD_INSTALL_DIR "" CACHE PATH "path to superbuild install directory")
set(DOWNLOAD_LOCATION "" CACHE PATH "path to superbuild binary directory")
endif()
else(OUT_OF_SOURCE_BUILD)
# SUPERBUILD_BINARY_DIR is only set in Packaging/CMakeLists.txt and not available
# in the parent scope like others. So we need to set it as CMAKE_BINARY_DIR
# if doing packages from source tree.
set( SUPERBUILD_BINARY_DIR ${CMAKE_BINARY_DIR} )
set( SUPERBUILD_INSTALL_DIR ${SB_INSTALL_PREFIX} )
set( OTB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
#if(WIN32 AND NOT MSVC)
#get_filename_component(OTB_INSTALL_DIR ${OTB_MODULES_DIR} PATH)
#get_filename_component(OTB_INSTALL_DIR ${OTB_INSTALL_DIR} PATH)
#get_filename_component(OTB_INSTALL_DIR ${OTB_INSTALL_DIR} PATH)
#get_filename_component(OTB_INSTALL_DIR ${OTB_INSTALL_DIR} PATH)
#endif()
endif(OUT_OF_SOURCE_BUILD)
if(WIN32)
set(ZIP_EXE_NAMES 7z 7za)
find_program(ZIP_EXECUTABLE NAMES ${ZIP_EXE_NAMES})
if(NOT ZIP_EXECUTABLE)
if(NOT ZIP_EXECUTABLE)
message(FATAL_ERROR "Cannot find 7z executable. searched names ${ZIP_EXE_NAMES}. Please add it to your path")
endif()
endif()
if(WIN32 AND NOT MSVC)
foreach(req
PACKAGE_OTB_SRC_DIR
OTB_BINARY_DIR
OTB_INSTALL_DIR
)
if(NOT DEFINED ${req} OR "${${req}}" STREQUAL "")
message(FATAL_ERROR "you must set ${req}")
endif()
set(vars "${vars} ${req}=[${${req}}]\n")
endforeach(req)
else() #Unix like
foreach(req
SUPERBUILD_BINARY_DIR
SUPERBUILD_INSTALL_DIR
SUPERBUILD_SOURCE_DIR
PACKAGE_OTB_SRC_DIR
)
if(NOT DEFINED ${req} OR "${${req}}" STREQUAL "")
message(FATAL_ERROR "you must set ${req}")
endif()
set(vars "${vars} ${req}=[${${req}}]\n")
endforeach(req)
set(required_vars
PACKAGE_OTB_SRC_DIR
OTB_BINARY_DIR
OTB_INSTALL_DIR
)
endif()
foreach(req
${required_vars}
SUPERBUILD_BINARY_DIR
SUPERBUILD_INSTALL_DIR
SUPERBUILD_SOURCE_DIR
PACKAGE_OTB_SRC_DIR
OTB_TARGET_SYSTEM_ARCH
OTB_TARGET_SYSTEM_ARCH_IS_X64
)
if(NOT DEFINED ${req} OR "${${req}}" STREQUAL "")
message(FATAL_ERROR "you must set ${req}")
endif()
set(vars "${vars} ${req}=[${${req}}]\n")
endforeach(req)
message("\n${vars}\n")
set(EXTRA_CACHE_CONFIG)
if(WIN32 AND NOT MSVC)
set(CMAKE_INSTALL_PREFIX "${OTB_INSTALL_DIR}")
else()
set(CMAKE_INSTALL_PREFIX "${SUPERBUILD_INSTALL_DIR}")
endif()
set(CMAKE_INSTALL_PREFIX "${SUPERBUILD_INSTALL_DIR}")
set(PACKAGE_NAME OTB)
set(PACKAGE_LONG_NAME OrfeoToolBox)
if(WIN32 AND NOT MSVC)
if(MXE_TARGET_DIR MATCHES "i686")
set(MXE_ARCH "i686")
set(PACKAGE_ARCH "32")
elseif(MXE_TARGET_DIR MATCHES "x86_64")
set(MXE_ARCH "x86_64")
set(PACKAGE_ARCH "64") #helper for ARCHIVE_NAME
endif()
# Make up part of output package file
set(PACKAGE_NAME OTB)
if(APPLE)
set(PACKAGE_PLATFORM_NAME "Darwin")
elseif(WIN32)
set(PACKAGE_PLATFORM_NAME "win")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(PACKAGE_PLATFORM_NAME "Linux")
endif()
set(PACKAGE_ARCH "32")
if(OTB_TARGET_SYSTEM_ARCH_IS_X64)
set(PACKAGE_ARCH "64")
endif()
if(MINGW)
get_filename_component(MXE_MXEROOT ${MXE_TARGET_DIR} PATH)
get_filename_component(MXE_MXEROOT ${MXE_MXEROOT} PATH)
set(EXTRA_CACHE_CONFIG
......@@ -141,22 +138,11 @@ if(WIN32 AND NOT MSVC)
set(MXE_ARCH \"${MXE_ARCH}\")
set(MXE_MXEROOT \"${MXE_MXEROOT}\")"
)
else() #(WIN32 AND NOT MSVC)
set(PACKAGE_ARCH 32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(PACKAGE_ARCH 64)
endif()
endif()
if(APPLE)
set(PACKAGE_PLATFORM_NAME "Darwin")
elseif(WIN32)
set(PACKAGE_PLATFORM_NAME "win")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(PACKAGE_PLATFORM_NAME "Linux")
set(CMAKE_INSTALL_PREFIX "${OTB_INSTALL_DIR}")
endif()
#get itk version from External_itk.cmake if not on mingw
# get itk version from External_itk.cmake if not on mingw
# because mxe has different version
if(NOT MINGW)
get_version(
INPUT_FILE "${SUPERBUILD_SOURCE_DIR}/CMake/External_itk.cmake"
......
......@@ -67,6 +67,8 @@ macro(macro_setup_cmake_project pkg)
set(PKG_OTB_VERSION_STRING \"${PKG_OTB_VERSION_STRING}\")
set(PKG_GENERATE_XDK ${PKG_GENERATE_XDK})
set(PATCHELF_PROGRAM ${PATCHELF_PROGRAM})
set(OTB_TARGET_SYSTEM_ARCH ${OTB_TARGET_SYSTEM_ARCH})
set(OTB_TARGET_SYSTEM_ARCH_IS_X64 ${OTB_TARGET_SYSTEM_ARCH_IS_X64})
set(PYTHON_EXECUTABLE \"${PYTHON_EXECUTABLE}\")
${EXTRA_CACHE_CONFIG}
include(${SUPERBUILD_SOURCE_DIR}/Packaging/PackageHelper.cmake)
......
......@@ -53,7 +53,8 @@ macro(macro_super_package)
)
if(NOT python_INSTALLED_SONAME_rv EQUAL 0)
message( FATAL_ERROR "python_INSTALLED_SONAME_rv=${python_INSTALLED_SONAME_rv}: Cannot find python library")
message( FATAL_ERROR
"python_INSTALLED_SONAME_rv=${python_INSTALLED_SONAME_rv}: Cannot find python library")
endif()
set(python_INSTALLED_SONAME "${python_INSTALLED_SONAME_ov}")
......@@ -64,6 +65,18 @@ macro(macro_super_package)
if(MSVC)
list(APPEND PKG_SEARCHDIRS "${DEPENDENCIES_INSTALL_DIR}/bin") #all other dlls
list(APPEND PKG_SEARCHDIRS "${DEPENDENCIES_INSTALL_DIR}/lib") #Qt & Qwt dlls
if(DEFINED ENV{UniversalCRTSdkDir})
file(TO_CMAKE_PATH "$ENV{UniversalCRTSdkDir}" UCRT_SDK_DIR)
list(
APPEND
PKG_SEARCHDIRS
"${UCRT_SDK_DIR}/Redist/ucrt/DLLs/${OTB_TARGET_SYSTEM_ARCH}"
) #ucrt dlls
else()
message(FATAL_ERROR
"UniversalCRTSdkDir variable not set.
call vcvarsall.bat <arch> first before starting build.")
endif()
else()
file(GLOB MXE_GCC_LIB_DIR "${DEPENDENCIES_INSTALL_DIR}/bin/gcc*")
list(APPEND PKG_SEARCHDIRS ${MXE_GCC_LIB_DIR})
......@@ -373,7 +386,8 @@ function(func_install_support_files)
####################### install GDAL data ############################
if(NOT EXISTS "${GDAL_DATA}/epsg.wkt")
message(FATAL_ERROR "Cannot generate package without GDAL_DATA : ${GDAL_DATA} ${DEPENDENCIES_INSTALL_DIR}")
message(FATAL_ERROR
"Cannot generate package without GDAL_DATA : ${GDAL_DATA} ${DEPENDENCIES_INSTALL_DIR}")
endif()
install(DIRECTORY ${GDAL_DATA} DESTINATION ${PKG_SHARE_DEST_DIR})
......@@ -389,7 +403,8 @@ function(func_install_support_files)
install(DIRECTORY ${PKG_SHARE_SOURCE_DIR}/proj DESTINATION ${PKG_SHARE_DEST_DIR})
endif()
set(PKG_VERSION_FILE "${OTB_INSTALL_DIR}/share/doc/${PKG_OTB_VERSION_MAJOR}.${PKG_OTB_VERSION_MINOR}/VERSION")
set(PKG_VERSION_FILE
"${OTB_INSTALL_DIR}/share/doc/${PKG_OTB_VERSION_MAJOR}.${PKG_OTB_VERSION_MINOR}/VERSION")
####################### Install copyrights ##########################
if(NOT MINGW)
......@@ -548,7 +563,11 @@ endfunction()
macro(macro_empty_package_staging_directory)
message(STATUS "Empty package staging directory: ${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}")
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}")
execute_process(
COMMAND ${CMAKE_COMMAND}
-E remove_directory
"${CMAKE_INSTALL_PREFIX}/${PKG_STAGE_DIR}"
)
endmacro() #macro_empty_package_staging_directory
#NOTE:
......@@ -583,7 +602,9 @@ function(func_prepare_package)
set(VAR_IN_PKGSETUP_CONFIGURE "bin/otbApplicationLauncherCommandLine")
set(PKG_PEFILES "${OTB_INSTALL_DIR}/bin/otbApplicationLauncherCommandLine${EXE_EXT}")
if(NOT EXISTS "${OTB_INSTALL_DIR}/bin/otbApplicationLauncherCommandLine${EXE_EXT}")
message(FATAL_ERROR "${OTB_INSTALL_DIR}/bin/otbApplicationLauncherCommandLine${EXE_EXT} not found.")
message(
FATAL_ERROR
"${OTB_INSTALL_DIR}/bin/otbApplicationLauncherCommandLine${EXE_EXT} not found.")
endif()
set(EXE_FILES)
......@@ -615,6 +636,11 @@ function(func_prepare_package)
endforeach() #EXE_SEARCH_DIR
endforeach()
# special case for msvc: ucrtbase.dll must be explicitly vetted.
if(MSVC)
list(APPEND PKG_PEFILES "ucrtbase.dll")
endif()
#loop again to report if anything is not found
foreach( EXE_FILE ${EXE_FILES} )
if(NOT FOUND_${EXE_FILE})
......@@ -628,23 +654,42 @@ function(func_prepare_package)
#NOTE: this is not used in windows yet..
foreach(OTB_APP_SO ${OTB_APPS_LIST})
get_filename_component(OTB_APP_SO_NAME ${OTB_APP_SO} NAME)
set(VAR_IN_PKGSETUP_CONFIGURE "${VAR_IN_PKGSETUP_CONFIGURE} lib/otb/applications/${OTB_APP_SO_NAME}")
set(VAR_IN_PKGSETUP_CONFIGURE
"${VAR_IN_PKGSETUP_CONFIGURE} lib/otb/applications/${OTB_APP_SO_NAME}")
endforeach()
list(APPEND PKG_PEFILES ${OTB_APPS_LIST})
if(EXISTS "${OTB_INSTALL_DIR}/lib/otb/python/_otbApplication${PYMODULE_EXT}")
list(APPEND PKG_PEFILES "${OTB_INSTALL_DIR}/lib/otb/python/_otbApplication${PYMODULE_EXT}")
install(DIRECTORY ${OTB_INSTALL_DIR}/lib/otb/python DESTINATION ${PKG_STAGE_DIR}/lib)
list(
APPEND
PKG_PEFILES
"${OTB_INSTALL_DIR}/lib/otb/python/_otbApplication${PYMODULE_EXT}"
)
install(
DIRECTORY
${OTB_INSTALL_DIR}/lib/otb/python
DESTINATION ${PKG_STAGE_DIR}/lib)
endif()
set(ALLOWED_SYSTEM_DLLS_SEARCH_PATHS
# Take gtk libs from system. we should fix this to take from custom
# build location
set(GTK_SYSTEM_LIBS_SEARCH_PATHS
/usr/lib
/lib64 )
func_install_support_files()
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/temp_so_names_dir")
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/temp_so_names_dir")
execute_process(
COMMAND ${CMAKE_COMMAND}
-E remove_directory
"${CMAKE_BINARY_DIR}/temp_so_names_dir"
)
execute_process(
COMMAND ${CMAKE_COMMAND}
-E make_directory
"${CMAKE_BINARY_DIR}/temp_so_names_dir"
)
set(alldlls)
set(notfound_dlls)
......@@ -661,7 +706,7 @@ function(func_prepare_package)
if(${found_index} GREATER -1)
#find_file (<VAR> NAMES name PATHS paths... NO_DEFAULT_PATH)
find_file ( ${allowed_system_dll}_abs_path NAMES ${allowed_system_dll}
PATHS ${ALLOWED_SYSTEM_DLLS_SEARCH_PATHS} NO_DEFAULT_PATH)
PATHS ${GTK_SYSTEM_LIBS_SEARCH_PATHS} NO_DEFAULT_PATH)
if(${allowed_system_dll}_abs_path)
file(GLOB fff "${${allowed_system_dll}_abs_path}*")
foreach(f ${fff})
......@@ -734,6 +779,7 @@ function(func_process_deps infile)
if(EXISTS ${SEARCHDIR}/${infile})
set(DLL_FOUND TRUE)
message(STATUS "Processing ${SEARCHDIR}/${infile}")
is_file_executable("${SEARCHDIR}/${infile}" is_executable)
if(is_executable)
file(APPEND ${CMAKE_BINARY_DIR}/install_to_${DEST_BIN_DIR} "${SEARCHDIR}/${infile}\n")
......@@ -988,7 +1034,6 @@ function(func_lisp install_list )
endfunction() # func_lisp
set(WINDOWS_SYSTEM_DLLS
msvc.*dll
user32.dll
gdi32.dll
shell32.dll
......@@ -1009,8 +1054,6 @@ set(WINDOWS_SYSTEM_DLLS
glu32.dll
rpcrt4.dll
winspool.drv
api-ms-win-crt*.*.dll
vcruntime*.*.dll
normaliz.dll
concrt*.*.dll
odbc32.dll
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment