diff options
| m--------- | libraries/MCAD | 0 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 15 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 14 |
3 files changed, 28 insertions, 1 deletions
diff --git a/libraries/MCAD b/libraries/MCAD -Subproject 1cc850b44914e1863adfaea2d6f9c848bbc514e +Subproject 9a958fd11b0a6b5f8becd37c4f8a42f585abfcd diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index f55e195..48f162a 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -53,6 +53,16 @@ printUsage() echo } +detect_glu() +{ + detect_glu_result= + if [ -e $DEPLOYDIR/include/GL/glu.h ]; then detect_glu_result=1; fi + if [ -e /usr/include/GL/glu.h ]; then detect_glu_result=1; fi + if [ -e /usr/local/include/GL/glu.h ]; then detect_glu_result=1; fi + if [ -e /usr/pkg/X11R7/include/GL/glu.h ]; then detect_glu_result=1; fi + return +} + build_glu() { version=$1 @@ -438,7 +448,8 @@ build_opencsg() cp src/Makefile src/Makefile.bak2 cat src/Makefile.bak2 | sed s@^LIBS.*@LIBS\ =\ -L$BASEDIR/lib\ -L/usr/X11R6/lib\ -lGLU\ -lGL@ > src/Makefile tmp=$version - build_glu 9.0.0 # todo - autodetect the need for glu + detect_glu + if [ ! $detect_glu_result ]; then build_glu 9.0.0 ; fi version=$tmp fi @@ -585,6 +596,8 @@ if [ $1 ]; then fi +# todo - cgal 4.02 for gcc<4.7, gcc 4.2 for above + # # Main build of libraries # edit version numbers here as needed. diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1c9eb9a..8e08204 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -40,8 +40,22 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") # Build debug build as default if(NOT CMAKE_BUILD_TYPE) +<<<<<<< HEAD + # set(CMAKE_BUILD_TYPE Release) + if(CMAKE_COMPILER_IS_GNUCXX) + execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) + if (GCC_VERSION VERSION_GREATER 4.6) + set(CMAKE_BUILD_TYPE RelWithDebInfo) + else() + set(CMAKE_BUILD_TYPE Debug) + endif() + else() + set(CMAKE_BUILD_TYPE RelWithDebInfo) + endif() +======= set(CMAKE_BUILD_TYPE RelWithDebInfo) # set(CMAKE_BUILD_TYPE Release) +>>>>>>> 4ebd8136a83325e67be7a39c9349ec8812aa05c1 endif() if(CMAKE_COMPILER_IS_GNUCXX) |