Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenFlipper
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenFlipper-Free
OpenFlipper
Commits
bbfc5939
Commit
bbfc5939
authored
6 months ago
by
Daniel Savchenko
Browse files
Options
Downloads
Patches
Plain Diff
change to python 312, because pybind cant find 313
parent
c4701980
No related branches found
No related tags found
2 merge requests
!265
Mac fix
,
!264
Mac fix
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/CMakeLists.txt
+1
-1
1 addition, 1 deletion
cmake/CMakeLists.txt
tests/run_tests.py
+3
-3
3 additions, 3 deletions
tests/run_tests.py
with
4 additions
and
4 deletions
cmake/CMakeLists.txt
+
1
−
1
View file @
bbfc5939
...
@@ -96,7 +96,7 @@ endif()
...
@@ -96,7 +96,7 @@ endif()
if
(
NOT DISABLE_OPENFLIPPER_PYTHON_SYSTEM
)
if
(
NOT DISABLE_OPENFLIPPER_PYTHON_SYSTEM
)
if
(
NOT Python3_FOUND
)
if
(
NOT Python3_FOUND
)
find_package
(
Python3 3.1
3
COMPONENTS Interpreter Development
)
find_package
(
Python3 3.1
2
COMPONENTS Interpreter Development
)
endif
()
endif
()
if
(
NOT TARGET pybind11::module OR NOT TARGET pybind11::embed
)
if
(
NOT TARGET pybind11::module OR NOT TARGET pybind11::embed
)
include
(
FetchContent
)
include
(
FetchContent
)
...
...
This diff is collapsed.
Click to expand it.
tests/run_tests.py
+
3
−
3
View file @
bbfc5939
...
@@ -131,9 +131,9 @@ elif sys.platform == "win32":
...
@@ -131,9 +131,9 @@ elif sys.platform == "win32":
cmake_parameters
=
[
cmake_executable
,
gtest_prefix
,
"
-G
"
,
cmake_generator
,
"
-DCMAKE_BUILD_TYPE=Debug
"
,
"
-DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE
"
]
cmake_parameters
=
[
cmake_executable
,
gtest_prefix
,
"
-G
"
,
cmake_generator
,
"
-DCMAKE_BUILD_TYPE=Debug
"
,
"
-DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE
"
]
cmake_parameters
.
append
(
"
--debug-output
"
)
cmake_parameters
.
append
(
"
--debug-output
"
)
cmake_parameters
.
append
(
"
-DPython3_INCLUDE_DIR=C:\Program Files\Python31
3
\include
"
)
cmake_parameters
.
append
(
"
-DPython3_INCLUDE_DIR=C:\Program Files\Python31
2
\include
"
)
cmake_parameters
.
append
(
"
-DPython3_LIBRARY=C:\Program Files\Python31
3
\libs\python31
3
.lib
"
)
cmake_parameters
.
append
(
"
-DPython3_LIBRARY=C:\Program Files\Python31
2
\libs\python31
2
.lib
"
)
cmake_parameters
.
append
(
"
-DPython3_EXECUTABLE=C:\Program Files\Python31
3
\python.exe
"
)
cmake_parameters
.
append
(
"
-DPython3_EXECUTABLE=C:\Program Files\Python31
2
\python.exe
"
)
cmake_parameters
.
extend
(
cmake_configuration_list
)
cmake_parameters
.
extend
(
cmake_configuration_list
)
cmake_parameters
.
append
(
"
..
"
)
cmake_parameters
.
append
(
"
..
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment