From 85bfe116e19afb3db372f237ca82febdbf315a87 Mon Sep 17 00:00:00 2001 From: looooo Date: Wed, 20 May 2020 14:34:39 +0200 Subject: [PATCH] win: fix path to freecad library --- src/Ext/freecad/CMakeLists.txt | 6 ++++++ src/Ext/freecad/__init__.py.template | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Ext/freecad/CMakeLists.txt b/src/Ext/freecad/CMakeLists.txt index aeafc4aaf8..e03b5527e9 100644 --- a/src/Ext/freecad/CMakeLists.txt +++ b/src/Ext/freecad/CMakeLists.txt @@ -4,6 +4,12 @@ OUTPUT_VARIABLE python_libs OUTPUT_STRIP_TRAILING_WHITESPACE ) SET(PYTHON_MAIN_DIR ${python_libs}) set(NAMESPACE_INIT "${CMAKE_BINARY_DIR}/Ext/freecad/__init__.py") +if (WIN32) + set(FREECAD_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) +else() + set(FREECAD_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) +endif() + configure_file(__init__.py.template ${NAMESPACE_INIT}) if (INSTALL_TO_SITEPACKAGES) diff --git a/src/Ext/freecad/__init__.py.template b/src/Ext/freecad/__init__.py.template index 86335f6e22..68ca151a59 100644 --- a/src/Ext/freecad/__init__.py.template +++ b/src/Ext/freecad/__init__.py.template @@ -14,7 +14,7 @@ except ModuleNotFoundError: # 2. we use the default freecad defined for this package _path_to_freecad_libdir = "${CMAKE_INSTALL_LIBDIR}" print("PATH_TO_FREECAD_LIBDIR not specified, using default \ -FreeCAD version in {}".format( "${CMAKE_INSTALL_LIBDIR}")) +FreeCAD version in {}".format( "${FREECAD_LIBRARY_INSTALL_DIR}")) _sys.path.append(_path_to_freecad_libdir) # this is the default version import FreeCAD as app