diff options
Diffstat (limited to 'cmake_paths_and_defs_fixes.patch')
| -rw-r--r-- | cmake_paths_and_defs_fixes.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/cmake_paths_and_defs_fixes.patch b/cmake_paths_and_defs_fixes.patch new file mode 100644 index 000000000000..017de55ef317 --- /dev/null +++ b/cmake_paths_and_defs_fixes.patch @@ -0,0 +1,120 @@ +diff -crB k3d.pristine/cmake/modules/K3DFindCARVE.cmake k3d/cmake/modules/K3DFindCARVE.cmake +*** k3d.pristine/cmake/modules/K3DFindCARVE.cmake 2016-07-15 22:06:59.900038000 +0200 +--- k3d/cmake/modules/K3DFindCARVE.cmake 2016-07-15 23:30:29.437934552 +0200 +*************** +*** 7,13 **** + ) + MARK_AS_ADVANCED(K3D_CARVE_INCLUDE_DIR) + +! FIND_LIBRARY(K3D_CARVE_LIBRARY intersect + DOC "The CARVE polyhedron boolean library" + ) + MARK_AS_ADVANCED(K3D_CARVE_LIBRARY) +--- 7,13 ---- + ) + MARK_AS_ADVANCED(K3D_CARVE_INCLUDE_DIR) + +! FIND_LIBRARY(K3D_CARVE_LIBRARY carve + DOC "The CARVE polyhedron boolean library" + ) + MARK_AS_ADVANCED(K3D_CARVE_LIBRARY) +diff -crB k3d.pristine/cmake/modules/K3DFindCollada.cmake k3d/cmake/modules/K3DFindCollada.cmake +*** k3d.pristine/cmake/modules/K3DFindCollada.cmake 2016-07-15 22:06:59.900038000 +0200 +--- k3d/cmake/modules/K3DFindCollada.cmake 2016-07-16 11:27:42.736775201 +0200 +*************** +*** 1,18 **** + SET(K3D_COLLADA_FOUND FALSE) + + IF(NOT APPLE) +! FIND_PATH(K3D_COLLADA_BASE_INCLUDE_PATH colladadom + DOC "Directory where the colladadom base directory is located" + ) + +! SET(K3D_COLLADA_DAE_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/colladadom CACHE PATH + "Directoy containing the Collada dae.h include file") + +! SET(K3D_COLLADA_DOM_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/colladadom/1.4 CACHE PATH + "Directoy containing the Collada dom includes") + + FIND_LIBRARY(K3D_COLLADA_LIBRARY +! NAMES collada14dom + PATHS + /usr/local/lib + /usr/lib +--- 1,18 ---- + SET(K3D_COLLADA_FOUND FALSE) + + IF(NOT APPLE) +! FIND_PATH(K3D_COLLADA_BASE_INCLUDE_PATH collada-dom2.4 + DOC "Directory where the colladadom base directory is located" + ) + +! SET(K3D_COLLADA_DAE_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/collada-dom2.4 CACHE PATH + "Directoy containing the Collada dae.h include file") + +! SET(K3D_COLLADA_DOM_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/collada-dom2.4/1.5 CACHE PATH + "Directoy containing the Collada dom includes") + + FIND_LIBRARY(K3D_COLLADA_LIBRARY +! NAMES collada-dom2.4-dp + PATHS + /usr/local/lib + /usr/lib +diff -crB k3d.pristine/cmake/modules/K3DFindOpenCascade.cmake k3d/cmake/modules/K3DFindOpenCascade.cmake +*** k3d.pristine/cmake/modules/K3DFindOpenCascade.cmake 2016-07-15 22:06:59.900038000 +0200 +--- k3d/cmake/modules/K3DFindOpenCascade.cmake 2016-07-15 22:10:14.223207779 +0200 +*************** +*** 1,12 **** + SET(K3D_OPENCASCADE_FOUND 0) + + FIND_PATH(K3D_OPENCASCADE_INCLUDE_DIR TDocStd_Document.hxx +! /opt/opencascade/ros/inc + DOC "Directory where the .hxx OpenCascade header files are located" + ) + MARK_AS_ADVANCED(K3D_OPENCASCADE_INCLUDE_DIR) + +! SET(K3D_OPENCASCADE_LIB_DIR /opt/opencascade/ros/Linux/lib CACHE PATH "Directory where the OpenCascade libraries are located") + MARK_AS_ADVANCED(K3D_OPENCASCADE_LIB_DIR) + + IF(K3D_OPENCASCADE_INCLUDE_DIR) +--- 1,12 ---- + SET(K3D_OPENCASCADE_FOUND 0) + + FIND_PATH(K3D_OPENCASCADE_INCLUDE_DIR TDocStd_Document.hxx +! /opt/opencascade/inc + DOC "Directory where the .hxx OpenCascade header files are located" + ) + MARK_AS_ADVANCED(K3D_OPENCASCADE_INCLUDE_DIR) + +! SET(K3D_OPENCASCADE_LIB_DIR /opt/opencascade/lib CACHE PATH "Directory where the OpenCascade libraries are located") + MARK_AS_ADVANCED(K3D_OPENCASCADE_LIB_DIR) + + IF(K3D_OPENCASCADE_INCLUDE_DIR) +diff -crB k3d.pristine/cmake/modules/K3DFindPython.cmake k3d/cmake/modules/K3DFindPython.cmake +*** k3d.pristine/cmake/modules/K3DFindPython.cmake 2016-07-15 22:06:59.900038000 +0200 +--- k3d/cmake/modules/K3DFindPython.cmake 2016-07-15 22:10:14.223207779 +0200 +*************** +*** 40,45 **** +--- 40,46 ---- + ENDIF() + ENDIF() + ELSE(APPLE) ++ SET(Python_ADDITIONAL_VERSIONS 2.7) + INCLUDE(FindPythonInterp) + INCLUDE(FindPythonLibs) + +diff -crB k3d.pristine/CMakeLists.txt k3d/CMakeLists.txt +*** k3d.pristine/CMakeLists.txt 2016-07-15 22:06:59.886705000 +0200 +--- k3d/CMakeLists.txt 2016-07-15 22:10:14.223207779 +0200 +*************** +*** 13,18 **** +--- 13,20 ---- + SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + SET(CMAKE_INSTALL_NAME_DIR "@exectuable_path/../lib/") + ++ ADD_DEFINITIONS(-DBOOST_SYSTEM_NO_DEPRECATED) ++ + INCLUDE(K3DOutOfSourceBuild) # Disallow in-source builds + INCLUDE(K3DCompileResource) + INCLUDE(K3DGenerateDEF) # Convenience macro for linking Win32 DLLs using MSVC +Only in k3d: CMakeLists.txt.user |