43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -2,7 +2,7 @@
|
|
project(pivy_cmake_setup CXX)
|
|
|
|
option(DISABLE_SWIG_WARNINGS "if on no swig warnings are shown" OFF)
|
|
-option(PIVY_USE_QT6 "Prefer Qt6 over Qt5 if available" OFF)
|
|
+option(PIVY_USE_QT6 "Prefer Qt6 over Qt5 if available" ON)
|
|
|
|
find_package(SWIG 4.0.0 REQUIRED)
|
|
include(${SWIG_USE_FILE})
|
|
--- a/distutils_cmake/CMakeLists.txt
|
|
+++ b/distutils_cmake/CMakeLists.txt
|
|
@@ -1,5 +1,5 @@
|
|
cmake_minimum_required(VERSION 3.5)
|
|
-project(pivy_cmake_setup NONE)
|
|
+project(pivy_cmake_setup CXX)
|
|
|
|
|
|
find_package(Coin CONFIG REQUIRED)
|
|
--- a/qtinfo.py
|
|
+++ b/qtinfo.py
|
|
@@ -7,7 +7,7 @@
|
|
if qmake_command:
|
|
self._qmake_command = qmake_command
|
|
else:
|
|
- self._qmake_command = [find_executable("qmake"),]
|
|
+ self._qmake_command = [find_executable("qmake6"),]
|
|
self._dict = {}
|
|
# bind all variables early at __init__ time.
|
|
for thing in self.__class__.__dict__:
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -573,7 +573,7 @@
|
|
else:
|
|
if "MSYSTEM" in os.environ:
|
|
CPP_FLAGS += ' -DSOQT_DLL'
|
|
- LDFLAGS_LIBS += ' -lSoQt'
|
|
+ LDFLAGS_LIBS += ' -lSoQt -lQt6Core'
|
|
|
|
if module == "coin":
|
|
if sys.platform == 'win32' and "MSYSTEM" not in os.environ:
|