merge in a year's worth of CERN work (c1ec14bc) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_draw_basic_functions.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -414,6 +414,6 @@ void CALLBACK tessErrorCB( GLenum errorCode )
		errorStr = gluErrorString( errorCode );

		// DEBUG //
		D( printf( "Tess ERROR: %s\n", errorStr ); )
		DBG( printf( "Tess ERROR: %s\n", errorStr ); )
		#endif
		}

3d-viewer/vrmlmodelparser.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ int VRML_MODEL_PARSER::readMaterial( FILE* file, int* LineNum )
		}
		}

		D( printf( "ReadMaterial error: material not found\n" ) );
		DBG( printf( "ReadMaterial error: material not found\n" ) );
		return 0;
		}

		@@ -207,7 +207,7 @@ int VRML_MODEL_PARSER::readChildren( FILE* file, int* LineNum )
		}
		else
		{
		D( printf( "ReadChildren error line %d <%s> \n", *LineNum, text ) );
		DBG( printf( "ReadChildren error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}
		@@ -241,7 +241,7 @@ int VRML_MODEL_PARSER::readShape( FILE* file, int* LineNum )
		}
		else
		{
		D( printf( "ReadShape error line %d <%s> \n", *LineNum, text ) );
		DBG( printf( "ReadShape error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}
		@@ -271,7 +271,7 @@ int VRML_MODEL_PARSER::readAppearance( FILE* file, int* LineNum )
		}
		else
		{
		D( printf( "ReadAppearance error line %d <%s> \n", *LineNum, text ) );
		DBG( printf( "ReadAppearance error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}

3d-viewer/x3dmodelparser.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -197,19 +197,19 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		if( !parseDoubleTriplet( properties[ wxT( "diffuseColor" ) ],
		material->m_DiffuseColor ) )
		{
		D( printf("diffuseColor parsing error") );
		DBG( printf("diffuseColor parsing error") );
		}

		if( !parseDoubleTriplet( properties[ wxT( "specularColor" ) ],
		material->m_SpecularColor ) )
		{
		D( printf("specularColor parsing error") );
		DBG( printf("specularColor parsing error") );
		}

		if( !parseDoubleTriplet( properties[ wxT( "emissiveColor" ) ],
		material->m_EmissiveColor ) )
		{
		D( printf("emissiveColor parsing error") );
		DBG( printf("emissiveColor parsing error") );
		}

		wxStringTokenizer values;
		@@ -221,7 +221,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		else
		{
		D( printf( "ambienterror" ) );
		DBG( printf( "ambienterror" ) );
		}

		values.SetString( properties[ wxT( "shininess" ) ] );
		@@ -232,7 +232,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		else
		{
		D( printf( "shininess error" ) );
		DBG( printf( "shininess error" ) );
		}

		values.SetString( properties[ wxT( "transparency" ) ] );
		@@ -243,7 +243,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		else
		{
		D( printf( "trans error") );
		DBG( printf( "trans error") );
		}

		material->SetMaterial();
		@@ -303,7 +303,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		}

		D( printf( "ReadMaterial error: material not found\n" ) );
		DBG( printf( "ReadMaterial error: material not found\n" ) );
		}
		}

		@@ -373,7 +373,7 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,
		tokens.GetNextToken().ToDouble( &rotation.z ) &&
		tokens.GetNextToken().ToDouble( &angle ) ) )
		{
		D( printf("rotation read error") );
		DBG( printf("rotation read error") );
		}

		double vrmlunits_to_3Dunits = g_Parm_3D_Visu.m_BiuTo3Dunits *
		@@ -407,7 +407,7 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,

		if( points.size() % 3 != 0 )
		{
		D( printf( "Number of points is incorrect" ) );
		DBG( printf( "Number of points is incorrect" ) );
		return;
		}

CMakeLists.txt

+19 −1

Original line number	Diff line number	Diff line
		@@ -230,12 +230,27 @@ include( ExternalProject )
		#================================================
		include( CheckFindPackageResult )

		# Turn on wxWidgets compatibility mode for some classes
		add_definitions(-DWX_COMPATIBILITY)

		#######################
		# Find OpenGL library #
		#######################
		find_package( OpenGL QUIET )
		check_find_package_result( OPENGL_FOUND "OpenGL" )

		#####################
		# Find GLEW library #
		#####################
		find_package(GLEW)
		check_find_package_result(GLEW_FOUND "GLEW")

		######################
		# Find Cairo library #
		######################
		find_package(Cairo 1.8.1 QUIET)
		check_find_package_result(CAIRO_FOUND "Cairo")

		# Download boost and possibly build parts of it
		#################################################
		include( download_boost )
		@@ -360,6 +375,7 @@ add_subdirectory( cvpcb )
		add_subdirectory( eeschema )
		add_subdirectory( gerbview )
		add_subdirectory( kicad )
		add_subdirectory( lib_dxf )
		add_subdirectory( pcbnew )
		add_subdirectory( polygon )
		add_subdirectory( pagelayout_editor )
		@@ -375,12 +391,14 @@ add_subdirectory( tools )
		add_dependencies( pcbnew boost )
		add_dependencies( eeschema boost )
		add_dependencies( cvpcb boost )
		add_dependencies( gal boost )
		add_dependencies( common boost )
		add_dependencies( pcbcommon boost )
		add_dependencies( 3d-viewer boost )
		add_dependencies( pcad2kicadpcb boost )
		add_dependencies( polygon boost )
		add_dependencies( pl_editor boost )
		add_dependencies( pnsrouter boost )


		#############

CMakeModules/FindCairo.cmake

0 → 100644

+168 −0

Original line number	Diff line number	Diff line
		# - Try to find the CAIRO library
		# Once done this will define
		#
		# CAIRO_ROOT_DIR - Set this variable to the root installation of CAIRO
		#
		# Read-Only variables:
		# CAIRO_FOUND - system has the CAIRO library
		# CAIRO_INCLUDE_DIR - the CAIRO include directory
		# CAIRO_LIBRARIES - The libraries needed to use CAIRO
		# CAIRO_VERSION - This is set to $major.$minor.$revision (eg. 0.9.8)

		#=============================================================================
		# Copyright 2012 Dmitry Baryshnikov <polimax at mail dot ru>
		#
		# Distributed under the OSI-approved BSD License (the "License");
		# see accompanying file Copyright.txt for details.
		#
		# This software is distributed WITHOUT ANY WARRANTY; without even the
		# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
		# See the License for more information.
		#=============================================================================
		# (To distribute this file outside of CMake, substitute the full
		# License text for the above reference.)

		if (UNIX)
		find_package(PkgConfig)
		if (PKG_CONFIG_FOUND)
		pkg_check_modules(_CAIRO cairo)
		endif (PKG_CONFIG_FOUND)
		endif (UNIX)

		SET(_CAIRO_ROOT_HINTS
		$ENV{CAIRO}
		${CAIRO_ROOT_DIR}
		)
		SET(_CAIRO_ROOT_PATHS
		$ENV{CAIRO}/src
		/usr
		/usr/local
		)
		SET(_CAIRO_ROOT_HINTS_AND_PATHS
		HINTS ${_CAIRO_ROOT_HINTS}
		PATHS ${_CAIRO_ROOT_PATHS}
		)

		FIND_PATH(CAIRO_INCLUDE_DIR
		NAMES
		cairo.h
		HINTS
		${_CAIRO_INCLUDEDIR}
		${_CAIRO_ROOT_HINTS_AND_PATHS}
		PATH_SUFFIXES
		include
		"include/cairo"
		)

		IF(WIN32 AND NOT CYGWIN)
		# MINGW should go here too
		IF(MSVC)
		# Implementation details:
		# We are using the libraries located in the VC subdir instead of the parent directory eventhough :
		FIND_LIBRARY(CAIRO_DEBUG
		NAMES
		cairod
		${_CAIRO_ROOT_HINTS_AND_PATHS}
		PATH_SUFFIXES
		"lib"
		"VC"
		"lib/VC"
		)

		FIND_LIBRARY(CAIRO_RELEASE
		NAMES
		cairo
		${_CAIRO_ROOT_HINTS_AND_PATHS}
		PATH_SUFFIXES
		"lib"
		"VC"
		"lib/VC"
		)

		if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
		if(NOT CAIRO_DEBUG)
		set(CAIRO_DEBUG ${CAIRO_RELEASE})
		endif(NOT CAIRO_DEBUG)
		set( CAIRO_LIBRARIES
		optimized ${CAIRO_RELEASE} debug ${CAIRO_DEBUG}
		)
		else()
		set( CAIRO_LIBRARIES ${CAIRO_RELEASE})
		endif()
		MARK_AS_ADVANCED(CAIRO_DEBUG CAIRO_RELEASE)
		ELSEIF(MINGW)
		# same player, for MingW
		FIND_LIBRARY(CAIRO
		NAMES
		cairo
		${_CAIRO_ROOT_HINTS_AND_PATHS}
		PATH_SUFFIXES
		"lib"
		"lib/MinGW"
		)

		MARK_AS_ADVANCED(CAIRO)
		set( CAIRO_LIBRARIES ${CAIRO})
		ELSE(MSVC)
		# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
		FIND_LIBRARY(CAIRO
		NAMES
		cairo
		HINTS
		${_CAIRO_LIBDIR}
		${_CAIRO_ROOT_HINTS_AND_PATHS}
		PATH_SUFFIXES
		lib
		)

		MARK_AS_ADVANCED(CAIRO)
		set( CAIRO_LIBRARIES ${CAIRO} )
		ENDIF(MSVC)
		ELSE(WIN32 AND NOT CYGWIN)

		FIND_LIBRARY(CAIRO_LIBRARY
		NAMES
		cairo
		HINTS
		${_CAIRO_LIBDIR}
		${_CAIRO_ROOT_HINTS_AND_PATHS}
		PATH_SUFFIXES
		"lib"
		"local/lib"
		)

		MARK_AS_ADVANCED(CAIRO_LIBRARY)

		# compat defines
		SET(CAIRO_LIBRARIES ${CAIRO_LIBRARY})

		ENDIF(WIN32 AND NOT CYGWIN)

		# if (CAIRO_INCLUDE_DIR)
		# file(READ "${CAIRO_INCLUDE_DIR}/gcore/gdal_version.h" _wxgisgdal_VERSION_H_CONTENTS)
		# string(REGEX REPLACE ".# define[ \t]+GDAL_RELEASE_NAME[ \t]+\"([0-9A-Za-z.]+)\"."
		# "\\1" CAIRO_VERSION ${_wxgisgdal_VERSION_H_CONTENTS})
		# set(CAIRO_VERSION ${CAIRO_VERSION} CACHE INTERNAL "The version number for wxgisgdal libraries")
		# endif (CAIRO_INCLUDE_DIR)

		include(FindPackageHandleStandardArgs)

		# if (CAIRO_VERSION)
		# find_package_handle_standard_args(CAIRO
		# REQUIRED_VARS
		# CAIRO_LIBRARIES
		# CAIRO_INCLUDE_DIR
		# VERSION_VAR
		# CAIRO_VERSION
		# FAIL_MESSAGE
		# "Could NOT find CAIRO, try to set the path to CAIRO root folder in the system variable CAIRO_ROOT_DIR"
		# )
		# else (CAIRO_VERSION)
		find_package_handle_standard_args(CAIRO "Could NOT find CAIRO, try to set the path to CAIRO root folder in the system variable CAIRO"
		CAIRO_LIBRARIES
		CAIRO_INCLUDE_DIR
		)
		# endif (CAIRO_VERSION)

		MARK_AS_ADVANCED(CAIRO_INCLUDE_DIR CAIRO_LIBRARIES)

Admin message