mirror of https://github.com/vitalif/openscad
Fix for bad boost libraries
Get this error because of a search for a non-existent library on linux64 ----------- [ 69%] Built target tests-cgal Scanning dependencies of target cgalcachetest [ 70%] Building CXX object CMakeFiles/cgalcachetest.dir/cgalcachetest.cc.o make[2]: *** No rule to make target `/usr/lib/libboost_thread.so', needed by `cgalcachetest'. Stop. make[1]: *** [CMakeFiles/cgalcachetest.dir/all] Error 2 make: *** [all] Error 2 [2]+ Done gedit openscad.pro (wd: ~/git/openscad_unicode) ----------brodykenrick-master
parent
eb046015d2
commit
7075d8d9c4
|
@ -384,11 +384,45 @@ if("${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}" VERSION_LESS 3.6)
|
||||||
endif()
|
endif()
|
||||||
inclusion(CGAL_DIR CGAL_INCLUDE_DIRS)
|
inclusion(CGAL_DIR CGAL_INCLUDE_DIRS)
|
||||||
|
|
||||||
|
#Get rid of bad libraries suggested for BOOST dependencies (they don't exist on some machines and cause build failures).
|
||||||
|
#/usr/lib/libboost_thread.so;/usr/lib/libboost_system.so;
|
||||||
|
string(FIND "${CGAL_3RD_PARTY_LIBRARIES}" "/usr/lib/libboost_system.so" FIND_POSITION )
|
||||||
|
if(NOT "-1" STREQUAL ${FIND_POSITION} )
|
||||||
|
if(NOT EXISTS "/usr/lib/libboost_system.so")
|
||||||
|
MESSAGE( WARNING "CGAL_3RD_PARTY_LIBRARIES:Found erroneous /usr/lib/libboost_system.so -- stripping" )
|
||||||
|
string(REPLACE "/usr/lib/libboost_system.so" "" CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
string(FIND "${CGAL_3RD_PARTY_LIBRARIES}" "/usr/lib/libboost_thread.so" FIND_POSITION )
|
||||||
|
if(NOT "-1" STREQUAL ${FIND_POSITION} )
|
||||||
|
if(NOT EXISTS "/usr/lib/libboost_thread.so")
|
||||||
|
MESSAGE( WARNING "CGAL_3RD_PARTY_LIBRARIES:Found erroneous /usr/lib/libboost_thread.so -- stripping" )
|
||||||
|
string(REPLACE "/usr/lib/libboost_thread.so" "" CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
if(${CMAKE_CXX_COMPILER} MATCHES ".*clang.*" AND NOT ${CGAL_CXX_FLAGS_INIT} STREQUAL "" )
|
if(${CMAKE_CXX_COMPILER} MATCHES ".*clang.*" AND NOT ${CGAL_CXX_FLAGS_INIT} STREQUAL "" )
|
||||||
string(REPLACE "-frounding-math" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT})
|
string(REPLACE "-frounding-math" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT})
|
||||||
string(REPLACE "--param=ssp-buffer-size=4" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT})
|
string(REPLACE "--param=ssp-buffer-size=4" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "")
|
||||||
|
# Force pkg-config to look _only_ in the local library folder
|
||||||
|
# in case OPENSCAD_LIBRARIES is set.
|
||||||
|
set(ENV{PKG_CONFIG_PATH} "$ENV{OPENSCAD_LIBRARIES}/lib/pkgconfig")
|
||||||
|
set(ENV{PKG_CONFIG_LIBDIR} "$ENV{OPENSCAD_LIBRARIES}/lib/pkgconfig")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Find libraries (system installed or dependency built) using pkg-config
|
||||||
|
find_package(PkgConfig REQUIRED)
|
||||||
|
|
||||||
|
#GLib-2
|
||||||
|
pkg_search_module(GLIB2 REQUIRED glib-2.0>=2.2.0)
|
||||||
|
#Can't use the CXXFlags directly as they are ;-separated
|
||||||
|
string(REPLACE ";" " " GLIB2_CFLAGS "${GLIB2_CFLAGS}")
|
||||||
|
message(STATUS "glib-2.0 found: ${GLIB2_VERSION}")
|
||||||
|
|
||||||
|
add_definitions(${GLIB2_CFLAGS})
|
||||||
|
|
||||||
# Imagemagick
|
# Imagemagick
|
||||||
|
|
||||||
if (SKIP_IMAGEMAGICK)
|
if (SKIP_IMAGEMAGICK)
|
||||||
|
|
Loading…
Reference in New Issue