This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -rZc a/src/App/Application.cpp b/src/App/Application.cpp | |
*** a/src/App/Application.cpp 2018-04-06 16:48:37.000000000 +0800 | |
--- b/src/App/Application.cpp 2018-08-13 17:12:13.478048380 +0800 | |
*************** | |
*** 230,236 **** | |
--- 230,241 ---- | |
NULL, NULL, NULL, NULL | |
}; | |
PyObject* pAppModule = PyModule_Create(&FreeCADModuleDef); | |
+ #if (PY_MAJOR_VERSION > 3 || PY_MINOR_VERSION >= 7) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- opencv3-release-release-lunar-opencv3-3.2.0-6/cmake/OpenCVCompilerOptions.cmake 2017-06-07 08:47:12.000000000 +0200 | |
+++ opencv3-release-release-lunar-opencv3-3.2.0-6-patched/cmake/OpenCVCompilerOptions.cmake 2017-10-10 11:05:00.268116070 +0200 | |
@@ -18,9 +18,9 @@ | |
message(STATUS "Unable to compile program with enabled ccache, reverting...") | |
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}") | |
endif() | |
- else() | |
- message(STATUS "Looking for ccache - not found") | |
endif() | |
+ else() |