Commit 84c496e1 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Upstream merge

parents d613da8b de65a7a1
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ option( KICAD_SCRIPTING_WXPYTHON
# python binary file should be is exec path.


option( USE_FP_LIB_TABLE "Use the new footprint library table implementation. ( default OFF)" )

option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF )


+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ macro(perform_feature_checks)
    check_symbol_exists(strcasecmp "strings.h" HAVE_STRCASECMP)
    check_symbol_exists(strncasecmp "string.h" HAVE_STRNCASECMP)
    check_symbol_exists(strncasecmp "strings.h" HAVE_STRNCASECMP)
    check_symbol_exists( strtok_r "string.h" HAVE_STRTOKR )

    # Some platforms define malloc and free in malloc.h instead of stdlib.h.
    check_symbol_exists(malloc "stdlib.h" MALLOC_IN_STDLIB_H)
@@ -92,7 +93,7 @@ macro(perform_feature_checks)

    # CMakes check_cxx_symbol_exists() doesn't work for templates so we must create a
    # small program to verify isinf() exists in cmath.
    check_cxx_source_compiles( "#include <cmath>\nusing namespace std;\nint main(int argc, char** argv)\n{\n  (void)argv;\n  isinf(1.0);  (void)argc;\n  return 0;\n}\n"  HAVE_CMATH_ISINF )
    check_cxx_source_compiles( "#include <cmath>\nint main(int argc, char** argv)\n{\n  (void)argv;\n  std::isinf(1.0);  (void)argc;\n  return 0;\n}\n"  HAVE_CMATH_ISINF )

    #check_symbol_exists(clock_gettime "time.h" HAVE_CLOCK_GETTIME) non-standard library, does not work
    check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
+2 −3
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@

#cmakedefine HAVE_STRNCASECMP

#cmakedefine HAVE_STRTOKR       // spelled odly to differ from wx's similar test

// Handle platform differences in math.h
#cmakedefine HAVE_MATH_H

@@ -56,9 +58,6 @@
/// The legacy file format revision of the *.brd file created by this build
#define LEGACY_BOARD_FILE_VERSION 2

/// Definition to compile with Pcbnew footprint library table implementation.
#cmakedefine USE_FP_LIB_TABLE

/// The install prefix defined in CMAKE_INSTALL_PREFIX.
#define DEFAULT_INSTALL_PATH               "@CMAKE_INSTALL_PREFIX"

+6 −4
Original line number Diff line number Diff line
@@ -74,10 +74,12 @@ Dialogs:
    size should the user have selected a font size of 13 points.

Quoting:
    Filenames and paths should be emphasized with <> angle brackets.  Anything
    else should be emphasized with single quotes ''.  e.g.:
    <filename.kicad_pcb>
    <longpath/subdir>
    Filenames, paths or other text should be with single quotes ''.  e.g.:
    'filename.kicad_pcb'
    'longpath/subdir'
    'FOOTPRINTNAME'
    'anything else'

    Often text strings like this end up in panels which use HTML rendering, and this
    can happen in the future.  Previously used angle brackets only cause grief there.
+5 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ set(COMMON_SRCS
    selcolor.cpp
    string.cpp
    trigo.cpp
    utf8.cpp
    wildcards_and_files_ext.cpp
    worksheet.cpp
    wxwineda.cpp
@@ -148,6 +149,10 @@ set(COMMON_SRCS
    zoom.cpp
    )

if( NOT HAVE_STRTOKR )
    set( COMMON_SRCS ${COMMON_SRCS} strtok_r.c )
endif()

enable_language(C CXX ASM)
set_source_files_properties(system/fcontext.s PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp")

Loading