Commit 879e6eb7 authored by Rashad Kanavath's avatar Rashad Kanavath

Merge remote-tracking branch 'origin/develop' into msvc_support

parents a8d86fc8 a3c1864d
......@@ -54,10 +54,10 @@ graphical launchers are provided). Check the `Download page <https://www.orfeo-t
This package is a self-extractible archive. You may uncompress it with a
double-click on the file, or with the command line :
::
.. parsed-literal::
chmod +x OTB-X.Y.Z-Linux64.run
./OTB-X.Y.Z-Linux64.run
chmod +x OTB-|release|-Linux64.run
./OTB-|release|-Linux64.run
Please note that the resulting installation is not meant to be moved,
you should uncompress the archive in its final location. Once the
......@@ -103,9 +103,9 @@ Notes:
- The helper scripts for monteverdi and mapla set required environment variables
- You might be tempted to move ``OTB-X.Y-Linux64`` into another location say /usr/local/ after extraction. But avoid this action!
- You might be tempted to move "OTB-|release|-Linux64" into another location say /usr/local/ after extraction. But avoid this action!
- To have ``OTB-X.Y-Linux64`` installed in /usr/local or /opt execute OTB-X.Y-Linux64.run in that directory.
- To have "OTB-|release|-Linux64" installed in /usr/local or /opt execute "OTB-|release|-Linux64.run" in that directory.
- Multiple installation of OTB can exists in same system without one conflicting the other!
......@@ -116,15 +116,15 @@ We provide for MacOS X through a standalone package. This package is a
self-extractible archive, quite similar to the Linux one. You may
uncompress it with the command line :
::
.. parsed-literal::
chmod +x OTB-X.Y.Z-Darwin64.run
./OTB-X.Y.Z-Darwin64.run
chmod +x OTB-|release|-Linux64.run
./OTB-|release|-Linux64.run
Once the archive is extracted, you can see OTB-X.Y.Z-Darwin64 directory in
the same direcrtory along with OTB-X.Y.Z-Darwin64.run
Once the archive is extracted, you can see OTB-|release|-Darwin64 directory in
the same direcrtory along with OTB-|release|-Darwin64.run
Contents of OTB-X.Y.Z-Darwin64 is briefly listed below:
Contents of OTB-|release|-Darwin64 is briefly listed below:
- ``Monteverdi.app`` : A Mac OSX .app for Monteverdi
......@@ -150,7 +150,7 @@ Notes:
- You must use monteverdi and mapla through their .app files only.
- You are allowed to move these .app files and refrain from moving or
deleting OTB-X.Y.Z-Darwin64 after extraction. In case you need to have OTB
deleting OTB-|release|-Darwin64 after extraction. In case you need to have OTB
installed in some other directory. Extract the .run file there.
Other packages
......@@ -273,14 +273,3 @@ following repositories with these command-lines:
http://download.opensuse.org/repositories/home:/tzotsos/openSUSE_Tumbleweed/ tzotsos
and then add the OTB packages as shown above.
MacPort
~~~~~~~
OTB Applications are now available on
`MacPorts <http://http://www.macports.org/>`__. The port name is called
’orfeotoolbox’. You can follow the `MacPorts
documentation < http://guide.macports.org/>`__ to install MacPorts
first, then install the ’orfeotoolbox’ port. After the installation, you
can used directly on your system, the OTB applications.
......@@ -2,6 +2,27 @@ INCLUDE_ONCE_MACRO(JPEG)
SETUP_SUPERBUILD(JPEG)
if(WIN32)
set(JPEG_CONFIGURE_COMMAND "${SB_CMAKE_COMMAND}"
${SB_CMAKE_CACHE_ARGS}
-DENABLE_SHARED=TRUE
-DENABLE_STATIC=FALSE
-DWITH_SIMD=FALSE
-DWITH_TURBOJPEG=FALSE
-DWITH_ARITH_DEC=TRUE
-DWITH_JAVA=FALSE
${JPEG_SB_SRC} )
else()
set(JPEG_CONFIGURE_COMMAND "${SB_ENV_CONFIGURE_CMD};${JPEG_SB_SRC}/configure"
${SB_CONFIGURE_ARGS}
--with-arith-dec
--without-simd
--without-java
)
endif()
ExternalProject_Add(JPEG
PREFIX JPEG
URL "http://sourceforge.net/projects/libjpeg-turbo/files/1.4.1/libjpeg-turbo-1.4.1.tar.gz"
......@@ -10,15 +31,7 @@ ExternalProject_Add(JPEG
BINARY_DIR ${JPEG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
-DENABLE_SHARED=TRUE
-DENABLE_STATIC=FALSE
-DWITH_SIMD=FALSE
-DWITH_TURBOJPEG=FALSE
-DWITH_ARITH_DEC=TRUE
-DWITH_JAVA=FALSE
${JPEG_SB_SRC}
CONFIGURE_COMMAND ${JPEG_CONFIGURE_COMMAND}
)
SUPERBUILD_PATCH_SOURCE(JPEG)
......
......@@ -22,7 +22,7 @@ ExternalProject_Add(PNG
-DPNG_STATIC:BOOL=OFF
-DPNG_SHARED:BOOL=ON
-DPNG_TESTS:BOOL=OFF
-DVERSIONED_OUTPUT_LIB:BOOL=ON
-DVERSIONED_OUTPUT_LIB:BOOL=OFF
-DSKIP_INSTALL_FILES:BOOL=ON
-DSKIP_INSTALL_EXECUTABLES:BOOL=OFF
${PNG_SB_CONFIG}
......
......@@ -137,6 +137,19 @@ if(UNIX)
endif()
set(SB_CMAKE_ARGS "-G${CMAKE_GENERATOR}")
set(SB_CONFIGURE_ARGS)
list(APPEND SB_CONFIGURE_ARGS "--prefix=${CMAKE_INSTALL_PREFIX}")
if(BUILD_SHARED_LIBS)
list(APPEND SB_CONFIGURE_ARGS "--enable-static=no")
list(APPEND SB_CONFIGURE_ARGS "--enable-shared=yes")
else()
list(APPEND SB_CONFIGURE_ARGS "--enable-static=yes")
list(APPEND SB_CONFIGURE_ARGS "--enable-shared=no")
endif()
if(UNIX)
if(APPLE)
set(SB_CMAKE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
......
......@@ -700,6 +700,12 @@ function(func_process_deps infile)
if(WIN32)
string(TOLOWER "${infile}" infile_lower )
endif()
is_system_dll(is_system "${infile}")
if(EXISTS ${infile} AND NOT is_system)
get_filename_component(infile ${infile} NAME)
endif()
get_filename_component(bn ${infile} NAME)
list_contains(contains "${bn}" "${alldlls}")
......@@ -742,17 +748,19 @@ function(func_process_deps infile)
${CMAKE_BINARY_DIR}/make_symlinks_temp
"ln -sf $OUT_DIR/lib/${linked_to_file} $OUT_DIR/lib/${basename_of_sofile}\n"
)
#message("${sofile} is a symlink to ${linked_to_file}")
# message("${sofile} is a symlink to ${linked_to_file}")
else() # is_symlink
if(NOT "${basename_of_sofile}" MATCHES "otbapp_")
file(APPEND ${CMAKE_BINARY_DIR}/install_to_${DEST_LIB_DIR} "${sofile}\n")
#just install the so file to <staging-dir>/lib
#install(FILES "${sofile}" DESTINATION ${PKG_STAGE_DIR}/lib MESSAGE_NEVER)
# Finally touch a file in temp directory for globbing later
# message("touching ${basename_of_sofile}")
execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/temp_so_names_dir/${basename_of_sofile}")
endif() #if(.. MATCHES "otbapp_")
endif() #is_symlink
if( EXISTS ${SEARCHDIR}/${sofile} )
file(APPEND ${CMAKE_BINARY_DIR}/install_to_${DEST_LIB_DIR} "${sofile}\n")
#just install the so file to <staging-dir>/lib
#install(FILES "${sofile}" DESTINATION ${PKG_STAGE_DIR}/lib MESSAGE_NEVER)
# Finally touch a file in temp directory for globbing later
# message("touching ${basename_of_sofile}")
execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/temp_so_names_dir/${basename_of_sofile}")
endif() # ( EXISTS ${SEARCHDIR}/${sofile} )
endif() # if(.. MATCHES "otbapp_")
endif() # is_symlink
endif() #is_valid
endforeach()
endif(is_executable)
......
diff -burN libjpeg-turbo-1.4.1.orig/CMakeLists.txt libjpeg-turbo-1.4.1/CMakeLists.txt
--- libjpeg-turbo-1.4.1.orig/CMakeLists.txt 2016-05-19 08:20:33.000000000 +0200
+++ libjpeg-turbo-1.4.1/CMakeLists.txt 2016-05-19 09:24:28.000000000 +0200
@@ -167,6 +167,11 @@
message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}")
+
+include(CheckTypeSize)
+check_type_size("size_t" JPEG_SIZEOF_SIZE_T)
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -DSIZEOF_SIZE_T=${JPEG_SIZEOF_SIZE_T})
+
configure_file(win/jconfig.h.in jconfig.h)
configure_file(win/jconfigint.h.in jconfigint.h)
@@ -287,9 +292,9 @@
endif()
if(WITH_12BIT)
- set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED -DUSE_SETMODE")
+ set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED")
else()
- set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
+ set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c)
set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
endif()
diff -burN libjpeg-turbo-1.4.1.orig/win/jconfig.h.in libjpeg-turbo-1.4.1/win/jconfig.h.in
--- libjpeg-turbo-1.4.1.orig/win/jconfig.h.in 2016-05-19 08:20:33.000000000 +0200
+++ libjpeg-turbo-1.4.1/win/jconfig.h.in 2016-05-19 09:26:12.000000000 +0200
@@ -48,3 +48,5 @@
#undef RIGHT_SHIFT_IS_UNSIGNED
#endif /* JPEG_INTERNALS */
+
+#undef USE_SETMODE
diff -burN libjpeg-turbo-1.4.1.orig/CMakeLists.txt libjpeg-turbo-1.4.1/CMakeLists.txt
--- libjpeg-turbo-1.4.1.orig/CMakeLists.txt 2016-05-19 08:20:33.000000000 +0200
+++ libjpeg-turbo-1.4.1/CMakeLists.txt 2016-05-19 09:24:28.000000000 +0200
@@ -167,6 +167,11 @@
message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}")
+
+include(CheckTypeSize)
+check_type_size("size_t" JPEG_SIZEOF_SIZE_T)
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -DSIZEOF_SIZE_T=${JPEG_SIZEOF_SIZE_T})
+
configure_file(win/jconfig.h.in jconfig.h)
configure_file(win/jconfigint.h.in jconfigint.h)
@@ -287,9 +292,9 @@
endif()
if(WITH_12BIT)
- set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED -DUSE_SETMODE")
+ set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED")
else()
- set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
+ set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c)
set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
endif()
diff -burN libjpeg-turbo-1.4.1.orig/win/jconfig.h.in libjpeg-turbo-1.4.1/win/jconfig.h.in
--- libjpeg-turbo-1.4.1.orig/win/jconfig.h.in 2016-05-19 08:20:33.000000000 +0200
+++ libjpeg-turbo-1.4.1/win/jconfig.h.in 2016-05-19 09:26:12.000000000 +0200
@@ -48,3 +48,5 @@
#undef RIGHT_SHIFT_IS_UNSIGNED
#endif /* JPEG_INTERNALS */
+
+#undef USE_SETMODE
diff -burN libjpeg-turbo-1.4.1.orig/CMakeLists.txt libjpeg-turbo-1.4.1/CMakeLists.txt
--- libjpeg-turbo-1.4.1.orig/CMakeLists.txt 2016-09-06 09:37:12.107984277 +0200
+++ libjpeg-turbo-1.4.1/CMakeLists.txt 2016-09-06 09:47:16.479979552 +0200
@@ -167,8 +167,14 @@
+++ libjpeg-turbo-1.4.1/CMakeLists.txt 2016-09-06 11:27:25.663932571 +0200
@@ -167,6 +167,7 @@
message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}")
-configure_file(win/jconfig.h.in jconfig.h)
-configure_file(win/jconfigint.h.in jconfigint.h)
+if(WIN32)
+ set(BUILD "04/02/2016")
+ configure_file(win/jconfig.h.in jconfig.h)
+ configure_file(win/jconfigint.h.in jconfigint.h)
+else()
+ configure_file(jconfig.h.in jconfig.h)
+ configure_file(jconfigint.h.in jconfigint.h)
+endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+set(BUILD "04/02/2016")
configure_file(win/jconfig.h.in jconfig.h)
configure_file(win/jconfigint.h.in jconfigint.h)
diff -burN lpng1616.orig/CMakeLists.txt lpng1616/CMakeLists.txt
--- lpng1616.orig/CMakeLists.txt 2016-09-06 09:49:13.951978634 +0200
+++ lpng1616/CMakeLists.txt 2016-09-06 10:41:01.911954335 +0200
+++ lpng1616/CMakeLists.txt 2016-09-06 14:08:21.275857081 +0200
@@ -17,7 +17,16 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
......@@ -40,7 +40,19 @@ diff -burN lpng1616.orig/CMakeLists.txt lpng1616/CMakeLists.txt
if(PNG_SHARED)
add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
set(PNG_LIB_TARGETS ${PNG_LIB_NAME})
@@ -286,18 +292,18 @@
@@ -253,9 +259,8 @@
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 16.${PNGLIB_RELEASE}.1.6.16
- VERSION 16.${PNGLIB_RELEASE}.0
- SOVERSION 16
+ VERSION ${PNGLIB_VERSION}
+ SOVERSION ${PNGLIB_MAJOR}
CLEAN_DIRECT_OUTPUT 1)
endif()
if(PNG_STATIC)
@@ -286,18 +291,18 @@
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -63,7 +75,7 @@ diff -burN lpng1616.orig/CMakeLists.txt lpng1616/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(NOT WIN32)
@@ -305,12 +311,12 @@
@@ -305,12 +310,12 @@
if(PNG_STATIC)
if(NOT WIN32 OR CYGWIN OR MINGW)
......@@ -79,7 +91,7 @@ diff -burN lpng1616.orig/CMakeLists.txt lpng1616/CMakeLists.txt
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
@@ -362,4 +368,3 @@
@@ -362,4 +367,3 @@
# to create msvc import lib for mingw compiled shared lib
# pexports libpng.dll > libpng.def
# lib /def:libpng.def /machine:x86
......
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