Commit c9ff660f authored by Rashad Kanavath's avatar Rashad Kanavath

PKG: fix failing package generate for windows

parent 40b516de
......@@ -113,15 +113,7 @@ set(PACKAGE_NAME OTB)
set(PACKAGE_LONG_NAME OrfeoToolBox)
if(WIN32)
set(EXTRA_CACHE_CONFIG
"set(CMAKE_CROSSCOMPILING TRUE)
set(WIN32 TRUE)
set(MXE_ARCH \"${MXE_ARCH}\")
set(MXE_MXEROOT \"${MXE_MXEROOT}\")"
)
set(ITK_VERSION_STRING)
set(PACKAGE_PLATFORM_NAME "win")
if(MXE_TARGET_DIR MATCHES "i686")
set(MXE_ARCH "i686")
......@@ -132,6 +124,13 @@ if(WIN32)
endif()
get_filename_component(MXE_MXEROOT ${MXE_TARGET_DIR} PATH)
get_filename_component(MXE_MXEROOT ${MXE_MXEROOT} PATH)
set(EXTRA_CACHE_CONFIG
"set(CMAKE_CROSSCOMPILING TRUE)
set(WIN32 TRUE)
set(MXE_ARCH \"${MXE_ARCH}\")
set(MXE_MXEROOT \"${MXE_MXEROOT}\")"
)
set(PACKAGE_VERSION_STRING ${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH})
else() #(WIN32)
......
......@@ -5,7 +5,7 @@ macro(macro_super_package)
message(FATAL_ERROR "PKG_STAGE_DIR is emtpy. Just can't continue.")
endif()
if(UNIX AND NOT APPLE)
if(NOT WIN32 AND NOT APPLE)
if(NOT PATCHELF_PROGRAM)
message(FATAL_ERROR "PATCHELF_PROGRAM not set")
endif()
......@@ -422,7 +422,7 @@ function(func_install_monteverdi_support_files)
set(PKG_QTSQLITE_FILENAME "qsqlite4.dll")
elseif(APPLE)
set(PKG_QTSQLITE_FILENAME "libqsqlite.dylib")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
set(PKG_QTSQLITE_FILENAME "libqsqlite.so")
else()
message(FATAL_ERROR "func_install_monteverdi_support_files: Unknown OS/Platform")
......
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