kicad-developers team mailing list archive

[Maciej Sumiński <maciej.suminski@xxxxxxx>]

The attached patch lists options that have "KICAD" in their name when
calling CMake:

-- Build configuration:
--     KICAD_BIN=bin
--     KICAD_BRANCH_NAME=
--     KICAD_DATA=share/kicad
--     KICAD_DEMOS=share/kicad/demos
--     KICAD_DOCS=share/doc/kicad
--     KICAD_INSTALL_DEMOS=ON
--     KICAD_LIB=lib64
--     KICAD_PLUGINS=lib64/kicad/plugins
--     KICAD_SCRIPTING=OFF
--     KICAD_SCRIPTING_ACTION_MENU=OFF
--     KICAD_SCRIPTING_MODULES=OFF
--     KICAD_SCRIPTING_WXPYTHON=OFF
--     KICAD_SPICE=OFF
--     KICAD_TEMPLATE=share/kicad/template
--     KICAD_USER_CONFIG_DIR=/home/orson
--     KICAD_USER_PLUGIN=lib64/kicad/plugins
--     KICAD_USE_OCE=OFF
--     KICAD_VERSION_EXTRA=

Perhaps that would be sufficient to inform the user about the flags he
may change.

Cheers,
Orson

On 12/07/2017 12:25 AM, Wayne Stambaugh wrote:
> ccmake is only useful when you aren't interested in scripting builds.
> It is a decent tool to discover the options but I would much prefer
> 
> cmake --show-options
> 
> to having to open up a GUI app.
> 
> On 12/06/2017 06:13 PM, Jacob Schmidt wrote:
>> I got frustrated a while back because people were talking about the
>> spice integration like it was a real thing, but I had never seen it.
>> That lead me to google how to list cmake options, and I found ccmake.
>>
>> ccmake is a wrapper around cmake that was useful to me. Maybe it will be
>> for someone reading this.
>>
>>
>> On 12/6/2017 8:04 AM, Wayne Stambaugh wrote:
>>>
>>> source.  Unfortunately, cmake does not have a command line switch that
>>> allows you to view the build options and their default settings.
>>> Autotools is far superior in this instance.  This is one of my pet
>>> peeves with cmake.  Most of the software I have built over the years
>>> typically only has the build options enabled for the features that will
>>> build on all platforms.
>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help   : https://help.launchpad.net/ListHelp
>>
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
> 

From 3cbdf914852e70e4ff7101e4e3ebb1fcf9ab36a2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@xxxxxxx>
Date: Thu, 7 Dec 2017 09:22:36 +0100
Subject: [PATCH] Display build configuration after invoking CMake

---
 CMakeLists.txt                   | 11 +++++++++++
 common/gal/opengl/opengl_gal.cpp | 21 +++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c70a34237..97747771c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -849,3 +849,14 @@ if ( KICAD_INSTALL_DEMOS )
 add_subdirectory( demos )
 endif ( KICAD_INSTALL_DEMOS )
 add_subdirectory( template )
+
+
+message( STATUS "Build configuration:" )
+get_cmake_property( VAR_NAMES VARIABLES )
+foreach( VAR_NAME ${VAR_NAMES} )
+    string( FIND "${VAR_NAME}" "KICAD" KICAD_FOUND )
+
+    if( NOT ${KICAD_FOUND} EQUAL -1 )
+        message( STATUS "    ${VAR_NAME}=${${VAR_NAME}}" )
+    endif()
+endforeach()
diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index 29d15096b..8e622dc24 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -954,28 +954,37 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
         {
             if( tildas % 2 == 1 )
             {
-                if( overbar )                   // Overbar begins
-                    overbarLength = 0;
-                else if( overbarLength > 0 )    // Overbar finishes
+                if( !overbar && overbarLength > 0 )    // Overbar finishes
+                {
                     drawBitmapOverbar( overbarLength, overbarHeight );
+                    overbarLength = 0;
+                }
 
                 --tildas;
             }
 
             // Draw tilda characters if there are any remaining
             for( int jj = 0; jj < tildas / 2; ++jj )
-                overbarLength += drawBitmapChar( '~' );
+            {
+                if( overbar )
+                    overbarLength += drawBitmapChar( '~' );
+                else
+                    drawBitmapChar( '~' );
+            }
 
             tildas = 0;
         }
 
-        overbarLength += drawBitmapChar( c );
+        if( overbar )
+            overbarLength += drawBitmapChar( c );
+        else
+            drawBitmapChar( c );
     }
 
     // Handle the case when overbar is active till the end of the drawn text
     currentManager->Translate( 0, commonOffset, 0 );
 
-    if( overbar )
+    if( overbarLength > 0 )
         drawBitmapOverbar( overbarLength, overbarHeight );
 
     Restore();
-- 
2.13.3

Attachment: signature.asc
Description: OpenPGP digital signature