mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-20 19:41:34 +01:00
graphics/brlcad: Fix build.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
b6b40e28a7
commit
053714cbb4
2 changed files with 46 additions and 1 deletions
|
@ -60,10 +60,12 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
patch -p0 < $CWD/brlcad.patch
|
||||
mkdir -p build
|
||||
cd build
|
||||
# There is a "known issue" according to the guys on #brlcad and we need
|
||||
# the cmake define "-DBRLCAD_ENABLE_STRICT=OFF" for now
|
||||
LDFLAGS="-lpng16" \
|
||||
cmake \
|
||||
-DBRLCAD_FLAGS_OPTIMIZATION=ON \
|
||||
-DBRLCAD_ENABLE_STRICT=OFF \
|
||||
|
@ -85,7 +87,7 @@ cmake \
|
|||
-DBRLCAD_LIBVDS=BUNDLED \
|
||||
-DBRLCAD_OPENNURBS=BUNDLED \
|
||||
-DBRLCAD_PERPLEX=BUNDLED \
|
||||
-DBRLCAD_PNG=BUNDLED \
|
||||
-DBRLCAD_PNG=OFF \
|
||||
-DBRLCAD_RE2C=BUNDLED \
|
||||
-DBRLCAD_SCL=BUNDLED \
|
||||
-DBRLCAD_TKHTML=BUNDLED \
|
||||
|
|
43
graphics/brlcad/brlcad.patch
Normal file
43
graphics/brlcad/brlcad.patch
Normal file
|
@ -0,0 +1,43 @@
|
|||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -2079,16 +2079,10 @@ if(NOT BRLCAD_IS_SUBBUILD)
|
||||
list(REMOVE_DUPLICATES CMAKE_EXTERNAL_TARGET_LIST)
|
||||
endif(CMAKE_EXTERNAL_TARGET_LIST)
|
||||
foreach(libtarget ${CMAKE_LIBRARY_TARGET_LIST})
|
||||
- #TODO - can this locate test be replaced with if(TARGET ${libtarget}) ?
|
||||
- if(NOT CMAKE_BUILD_TYPE)
|
||||
- get_target_property(target_location ${libtarget} LOCATION)
|
||||
- else(NOT CMAKE_BUILD_TYPE)
|
||||
- get_target_property(target_location ${libtarget} LOCATION_${CMAKE_BUILD_TYPE})
|
||||
- endif(NOT CMAKE_BUILD_TYPE)
|
||||
- if(target_location)
|
||||
+ if(TARGET ${libtarget})
|
||||
add_dependencies(${libtarget} timestamp)
|
||||
add_dependencies(buildtimedelta ${libtarget})
|
||||
- endif(target_location)
|
||||
+ endif(TARGET ${libtarget})
|
||||
endforeach(libtarget ${CMAKE_LIBRARY_TARGET_LIST})
|
||||
foreach(exectarget ${CMAKE_EXEC_TARGET_LIST})
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
--- misc/CMake/BRLCAD_CMakeFiles.cmake
|
||||
+++ misc/CMake/BRLCAD_CMakeFiles.cmake
|
||||
@@ -65,7 +65,7 @@ macro(CMAKEFILES)
|
||||
# make sure the file is there. Normally attempting to ignore
|
||||
# a non-existent file is a fatal error, but these keywords
|
||||
# don't necessarily refer to files.
|
||||
- set(TARGET_FLAGS SHARED STATIC OBJECT WIN32 UNKNOWN IMPORTED)
|
||||
+ set(TARGET_FLAGS SHARED STATIC OBJECT WIN32 UNKNOWN IMPORTED MODULE INTERFACE)
|
||||
foreach(TARGET_FLAG ${TARGET_FLAGS})
|
||||
if("${TARGET_FLAG}" STREQUAL "${ITEM}")
|
||||
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${ITEM})
|
||||
--- src/libpc/CMakeLists.txt
|
||||
+++ src/libpc/CMakeLists.txt
|
||||
@@ -58,6 +58,7 @@ set(LIBPC_SOURCES
|
||||
|
||||
add_definitions(
|
||||
-DOBJ_BREP=1
|
||||
+ -DBOOST_DETAIL_NO_CONTAINER_FWD
|
||||
)
|
||||
|
||||
BRLCAD_ADDLIB(libpc "${LIBPC_SOURCES}" "libbu;${OPENNURBS_LIBRARY};${STDCXX_LIBRARIES}" NO_STRICT_CXX)
|
||||
|
Loading…
Reference in a new issue