Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
a2483d48
Commit
a2483d48
authored
Feb 07, 2014
by
Marco Serantoni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MacOSX] Fixing qa, thanks Miguel Angel for the feedback
parent
bbff6c0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
CMakeLists.txt
CMakeLists.txt
+10
-3
CMakeLists.txt
qa/CMakeLists.txt
+5
-1
No files found.
CMakeLists.txt
View file @
a2483d48
...
...
@@ -383,8 +383,6 @@ if( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC )
endif
()
message
(
STATUS
"SWIG_EXECUTABLE:
${
SWIG_EXECUTABLE
}
"
)
set
(
PYTHON_EXECUTABLE /usr/bin/python2.6
)
set
(
PYTHON_DEST
${
LIBWXPYTHON_ROOT
}
/wxPython/lib/python2.6/site-packages
)
set
(
wxWidgets_BIN_DIR
${
LIBWXPYTHON_ROOT
}
/bin/wxrc
)
...
...
@@ -504,7 +502,16 @@ set( INC_AFTER
# Find Python and other scripting resources
if
(
KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES
)
set
(
PythonInterp_FIND_VERSION
)
if
(
NOT APPLE
)
set
(
PythonInterp_FIND_VERSION
)
else
()
set
(
PYTHON_LIBRARY /System/Library/Frameworks/Python.framework/Versions/2.6/Python
)
set
(
PYTHON_INCLUDE_DIR /System/Library/Frameworks/Python.framework/Versions//2.6/include/python2.6
)
set
(
PythonInterp_FIND_VERSION 2.6
)
set
(
PythonLibs_FIND_VERSION 2.6
)
endif
()
find_package
(
PythonInterp
)
check_find_package_result
(
PYTHONINTERP_FOUND
"Python Interpreter"
)
...
...
qa/CMakeLists.txt
View file @
a2483d48
if
(
KICAD_SCRIPTING_MODULES
)
if
(
APPLE
AND
(
KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC
)
)
set
(
PYTHON_QA_PATH :
${
LIBWXPYTHON_ROOT
}
/wxPython/lib/python2.6/site-packages
)
endif
()
# build target that runs the QA tests through scripting
add_custom_target
(
qa
COMMAND PYTHONPATH=
${
CMAKE_BINARY_DIR
}
/pcbnew
${
PYTHON_EXECUTABLE
}
test.py
COMMAND PYTHONPATH=
${
CMAKE_BINARY_DIR
}
/pcbnew
${
PYTHON_QA_PATH
}
${
PYTHON_EXECUTABLE
}
test.py
COMMENT
"running qa"
WORKING_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment