Skip to content

Commit

Permalink
Field3D-1.7.2 (rebuild for libboost)
Browse files Browse the repository at this point in the history
  • Loading branch information
fd00 committed Sep 30, 2017
1 parent 790fd5b commit 8de7ca1
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 135 deletions.
119 changes: 0 additions & 119 deletions Field3D/Field3D-1.7.2-1bl1.src.patch

This file was deleted.

File renamed without changes.
76 changes: 76 additions & 0 deletions Field3D/Field3D-1.7.2-1bl2.src.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
--- origsrc/Field3D-1.7.2/CMakeLists.txt 2016-06-19 13:56:00.000000000 +0900
+++ src/Field3D-1.7.2/CMakeLists.txt 2017-09-30 15:48:50.915000000 +0900
@@ -75,7 +75,10 @@ LINK_DIRECTORIES ( ${HDF5_LIBRARY_DIRS}
LINK_DIRECTORIES ( ${ILMBASE_LIBRARY_DIRS} )

IF ( CMAKE_HOST_UNIX )
- ADD_DEFINITIONS ( -fPIC -DREQUIRE_IOSTREAM -Wno-invalid-offsetof )
+ ADD_DEFINITIONS ( -DREQUIRE_IOSTREAM -Wno-invalid-offsetof )
+ IF ( NOT CYGWIN )
+ ADD_DEFINITIONS ( -fPIC )
+ ENDIF ( )
ENDIF ( )
IF ( CMAKE_HOST_WIN32 )
ADD_DEFINITIONS (
@@ -149,7 +152,8 @@ IF ( CMAKE_HOST_UNIX )
LIST ( APPEND Field3D_Libraries_Shared
Iex Half IlmThread Imath
pthread dl z )
- SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+ SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared}
+ ${Boost_LIBRARIES} )
SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
${Boost_LIBRARIES} )
ENDIF ( )
@@ -242,23 +246,22 @@ ADD_EXECUTABLE ( create_and_write

TARGET_LINK_LIBRARIES ( create_and_write ${Field3D_BIN_Libraries} )

-IF (DOXYGEN_FOUND)
+IF (INSTALL_DOCS AND DOXYGEN_FOUND)
ADD_CUSTOM_TARGET ( doc
ALL
${DOXYGEN_EXECUTABLE} Field3D.doxyfile
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
)
- IF (INSTALL_DOCS)
INSTALL (DIRECTORY
${CMAKE_HOME_DIRECTORY}/docs
DESTINATION ${CMAKE_INSTALL_PREFIX}
)
- ENDIF (INSTALL_DOCS)
-ENDIF (DOXYGEN_FOUND)
+ENDIF (INSTALL_DOCS AND DOXYGEN_FOUND)

INSTALL ( TARGETS
Field3D
- DESTINATION lib${LIB_SUFFIX}
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
)

FILE(GLOB Field3d_Includes "${CMAKE_CURRENT_SOURCE_DIR}/export/*.h")
@@ -272,3 +275,10 @@ INSTALL ( TARGETS f3dinfo
RUNTIME DESTINATION bin
)

+SET(prefix ${CMAKE_INSTALL_PREFIX})
+SET(exec_prefix ${CMAKE_INSTALL_PREFIX})
+SET(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+SET(includedir ${CMAKE_INSTALL_PREFIX}/include)
+SET(VERSION "1.7.2")
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Field3D.pc.in ${CMAKE_BINARY_DIR}/Field3D.pc @ONLY)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/Field3D.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
--- origsrc/Field3D-1.7.2/Field3D.pc.in 1970-01-01 09:00:00.000000000 +0900
+++ src/Field3D-1.7.2/Field3D.pc.in 2017-09-30 15:48:47.609415700 +0900
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Field3D
+Description: Library for storing voxel data on disk and in memory
+Version: @VERSION@
+Libs: -L${libdir} -lField3D
+Cflags: -I${includedir}
36 changes: 20 additions & 16 deletions Field3D/README
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,29 @@ format, and in Houdini it serves as the base for our voxel and levelset
editing toolsets.

Runtime requirements:
cygwin-2.6.0-1
libboost_program_options1.60-1.60.0-2
libboost_regex1.60-1.60.0-2
libboost_system1.60-1.60.0-2
libboost_thread1.60-1.60.0-2
libField3D-devel-1.7.2-1bl1
libField3D1.7-1.7.2-1bl1
libgcc1-5.4.0-1
libhdf5_10-1.8.17-1
cygwin-2.9.0-3
libboost_program_options1.63-1.63.0-1
libboost_regex1.63-1.63.0-1
libboost_system1.63-1.63.0-1
libboost_thread1.63-1.63.0-1
libField3D-devel-1.7.2-1bl2
libField3D1.7-1.7.2-1bl2
libgcc1-6.4.0-1
libhdf5_10-1.8.19-1
libilmbase12-2.2.0-1
libstdc++6-5.4.0-1
libstdc++6-6.4.0-1
pkg-config-0.29.1-1
zlib0-1.2.8-3
zlib0-1.2.11-1

Build requirements:
(besides corresponding -devel packages)
binutils-2.25-4
binutils-2.28-3
cmake-3.6.2-1
cygport-0.23.0-1
gcc-core-5.4.0-1
gcc-g++-5.4.0-1
make-4.2.1-1
cygport-0.24.1-1
gcc-core-6.4.0-1
gcc-g++-6.4.0-1
make-4.2.1-2
python-2.7.13-1

Canonical website:
https://sites.google.com/site/field3d/
Expand Down Expand Up @@ -135,6 +136,9 @@ Files included in the binary package:

Port Notes:

----- version 1.7.2-1bl2 -----
Rebuild for libboost

----- version 1.7.2-1bl1 -----
Version bump.

Expand Down

0 comments on commit 8de7ca1

Please sign in to comment.