haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some typos in CMakeLists.txt

This commit is contained in:
Marcus A 2018-07-21 10:53:07 +02:00 committed by Maciej Suminski
parent 0dcc26f866
commit d5f81c7255
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -72,7 +72,7 @@ option( KICAD_SCRIPTING_WXPYTHON
ON ) ON )
option( KICAD_SCRIPTING_ACTION_MENU option( KICAD_SCRIPTING_ACTION_MENU
"Build a tools menu with registred python plugins: actions plugins (default OFF)." "Build a tools menu with registered python plugins: actions plugins (default OFF)."
) )
option( KICAD_USE_OCE option( KICAD_USE_OCE
@ -84,14 +84,14 @@ option( KICAD_USE_OCC
OFF ) OFF )
option( KICAD_INSTALL_DEMOS option( KICAD_INSTALL_DEMOS
"Install kicad demos and examples (default ON)" "Install KiCad demos and examples (default ON)"
ON ) ON )
# when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled: # when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled:
# PYTHON_EXECUTABLE can be defined when invoking cmake # PYTHON_EXECUTABLE can be defined when invoking cmake
# ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 ) # ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 )
# when not defined by user, the default is python.exe under Windows and python2 for others # when not defined by user, the default is python.exe under Windows and python2 for others
# python binary file should be is exec path. # python binary file should be in exec path.
# KICAD_SCRIPTING_MODULES requires KICAD_SCRIPTING enable it here if KICAD_SCRIPTING_MODULES is ON # KICAD_SCRIPTING_MODULES requires KICAD_SCRIPTING enable it here if KICAD_SCRIPTING_MODULES is ON
if ( KICAD_SCRIPTING_MODULES AND NOT KICAD_SCRIPTING ) if ( KICAD_SCRIPTING_MODULES AND NOT KICAD_SCRIPTING )
@ -107,7 +107,7 @@ endif()
option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." ON ) option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." ON )
option( KICAD_SPICE "Build Kicad with internal Spice simulator." ON ) option( KICAD_SPICE "Build KiCad with internal Spice simulator." ON )
# Global setting: exports are explicit # Global setting: exports are explicit
set( CMAKE_CXX_VISIBILITY_PRESET "hidden" ) set( CMAKE_CXX_VISIBILITY_PRESET "hidden" )
@ -163,7 +163,7 @@ if( NOT DEFAULT_INSTALL_PATH )
"Location of KiCad data files." ) "Location of KiCad data files." )
endif() endif()
message( STATUS "Kicad install dir: <${DEFAULT_INSTALL_PATH}>" ) message( STATUS "KiCad install dir: <${DEFAULT_INSTALL_PATH}>" )
# Generate build system specific header file. # Generate build system specific header file.
include( PerformFeatureChecks ) include( PerformFeatureChecks )
@ -204,7 +204,7 @@ endif()
# Unfortunately, the swig autogenerated files have a lot of shadowed variables # Unfortunately, the swig autogenerated files have a lot of shadowed variables
# and -Wno-shadow does not exist. # and -Wno-shadow does not exist.
# Adding -Wshadow can be made only for .cpp files # Adding -Wshadow can be made only for .cpp files
#and will be added later in CMakeLists.txt # and will be added later in CMakeLists.txt
if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
@ -281,7 +281,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" ) set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
# _UNICODE definition seems needed under mingw/gcc 4.8 # _UNICODE definition seems needed under mingw/gcc 4.8
# (Kicad uses unicode, and on Windows, wxWidgets >= 2.9.4 is mandatory # (KiCad uses unicode, and on Windows, wxWidgets >= 2.9.4 is mandatory
# and uses unicode) # and uses unicode)
if( GCC_VERSION VERSION_EQUAL 4.8.0 OR GCC_VERSION VERSION_GREATER 4.8.0 ) if( GCC_VERSION VERSION_EQUAL 4.8.0 OR GCC_VERSION VERSION_GREATER 4.8.0 )
add_definitions(-D_UNICODE) add_definitions(-D_UNICODE)