mirror of https://github.com/vitalif/openscad
update FindBoost from cmake git. improve crash handling + boost finding
parent
462a4f4f44
commit
9a665075c9
|
@ -61,7 +61,7 @@ $ DISPLAY=:5 ctest
|
||||||
the -D option. See CMakeLists.txt for more information. Examples:
|
the -D option. See CMakeLists.txt for more information. Examples:
|
||||||
|
|
||||||
cmake . -DOPENCSG_DIR=~/OpenCSG-1.3.2
|
cmake . -DOPENCSG_DIR=~/OpenCSG-1.3.2
|
||||||
cmake . -DCGAL_DIR=c:\CGAL-3.7 -DBOOST_ROOT=c:\boost_1_46_0
|
cmake . -DCGAL_DIR=c:\CGAL-3.7 -DBOOST_DIR=c:\boost_1_46_0
|
||||||
|
|
||||||
2. Logs
|
2. Logs
|
||||||
|
|
||||||
|
@ -76,7 +76,8 @@ Cross-compiling of tests has not been automated nor tested
|
||||||
|
|
||||||
4. Testing images takes forever, they fail, and it says 'return -11'
|
4. Testing images takes forever, they fail, and it says 'return -11'
|
||||||
|
|
||||||
Imagemagick may have crashed. Try passing -DCOMPARATOR=ncc to cmake
|
Imagemagick may have crashed. You can try using the alternate comparison
|
||||||
|
based on Normalized Cross Correlation. Pass -DCOMPARATOR=ncc to cmake
|
||||||
|
|
||||||
5. Testing images fails with 'morphology' not found for ImageMagick
|
5. Testing images fails with 'morphology' not found for ImageMagick
|
||||||
|
|
||||||
|
|
|
@ -71,14 +71,24 @@ if (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "")
|
||||||
set(BOOST_ROOT "$ENV{MACOSX_DEPLOY_DIR}")
|
set(BOOST_ROOT "$ENV{MACOSX_DEPLOY_DIR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (NOT $ENV{BOOST_DIR} STREQUAL "")
|
||||||
|
set(BOOST_DIR "$ENV{BOOST_DIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT ${BOOST_DIR} STREQUAL "")
|
||||||
|
set(BOOST_ROOT ${BOOST_DIR})
|
||||||
|
message(STATUS "BOOST_ROOT: " ${BOOST_ROOT})
|
||||||
|
set(Boost_NO_SYSTEM_PATHS "TRUE")
|
||||||
|
set(Boost_DEBUG TRUE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(Boost_USE_STATIC_LIBS TRUE)
|
set(Boost_USE_STATIC_LIBS TRUE)
|
||||||
set(BOOST_STATIC TRUE)
|
set(BOOST_STATIC TRUE)
|
||||||
set(BOOST_THREAD_USE_LIB TRUE)
|
set(BOOST_THREAD_USE_LIB TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#set(Boost_DEBUG TRUE)
|
|
||||||
set(Boost_NO_SYSTEM_PATHS TRUE)
|
|
||||||
set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.0")
|
set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.0")
|
||||||
find_package( Boost 1.35.0 COMPONENTS thread program_options )
|
find_package( Boost 1.35.0 COMPONENTS thread program_options )
|
||||||
if(Boost_FOUND)
|
if(Boost_FOUND)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -26,6 +26,7 @@ import re
|
||||||
import getopt
|
import getopt
|
||||||
import shutil
|
import shutil
|
||||||
import platform
|
import platform
|
||||||
|
import string
|
||||||
|
|
||||||
def initialize_environment():
|
def initialize_environment():
|
||||||
if not options.generate: options.generate = bool(os.getenv("TEST_GENERATE"))
|
if not options.generate: options.generate = bool(os.getenv("TEST_GENERATE"))
|
||||||
|
@ -91,8 +92,7 @@ def compare_png(resultfilename):
|
||||||
options.convert_exec = 'compare'
|
options.convert_exec = 'compare'
|
||||||
compare_method = 'NCC'
|
compare_method = 'NCC'
|
||||||
|
|
||||||
msg = 'ImageMagick image comparison: '
|
msg = 'ImageMagick image comparison: ' + options.convert_exec + ' '+ ' '.join(args[2:])
|
||||||
msg += os.path.basename(options.convert_exec) + ' ' + ' '.join(args)
|
|
||||||
msg += '\nexpected image: ' + expectedfilename + '\n'
|
msg += '\nexpected image: ' + expectedfilename + '\n'
|
||||||
print >> sys.stderr, msg
|
print >> sys.stderr, msg
|
||||||
if not resultfilename:
|
if not resultfilename:
|
||||||
|
|
Loading…
Reference in New Issue