From 16c776e72142792b2a5cc11634c26526e23e7c13 Mon Sep 17 00:00:00 2001 From: abn Date: Tue, 21 Jun 2016 16:35:42 +0200 Subject: [PATCH] Tools : paths were not properly passed to the sub CMake project. --- tools/CMakeLists.txt | 6 +++--- tools/PyConsole/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1ca8dc33b..8013abd2d 100755 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -29,9 +29,9 @@ ENDIF() IF(SALOME_USE_PYCONSOLE) # Include sub-project PyConsole: SET(TOOLS_EXPORT_NAME ${PROJECT_NAME}) - SET(PYCONSOLE_INSTALL_LIBS "${SALOME_INSTALL_LIBS}") - SET(PYCONSOLE_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}") - SET(PYCONSOLE_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}") + SET(PYCONSOLE_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "") + SET(PYCONSOLE_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "") + SET(PYCONSOLE_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}" CACHE PATH "") OPTION(PYCONSOLE_BUILD_WITH_QT5 "Build PYCONSOLE with Qt 5" ${SALOME_BUILD_WITH_QT5}) ADD_SUBDIRECTORY(../tools/PyConsole) # will bring in PyInterp automatically diff --git a/tools/PyConsole/CMakeLists.txt b/tools/PyConsole/CMakeLists.txt index 136b81e9b..30f21888b 100644 --- a/tools/PyConsole/CMakeLists.txt +++ b/tools/PyConsole/CMakeLists.txt @@ -76,9 +76,9 @@ SET(PYCONSOLE_INSTALL_RES share/resources CACHE PATH "Install path: PyConsole re # Tool dependencies # ================= # PyConsole depends on PyInterp: -SET(PYINTERP_INSTALL_LIBS "${PYCONSOLE_INSTALL_LIBS}") -SET(PYINTERP_INSTALL_HEADERS "${PYCONSOLE_INSTALL_HEADERS}") -SET(PYINTERP_INSTALL_RES "${PYCONSOLE_INSTALL_RES}") +SET(PYINTERP_INSTALL_LIBS "${PYCONSOLE_INSTALL_LIBS}" CACHE PATH "") +SET(PYINTERP_INSTALL_HEADERS "${PYCONSOLE_INSTALL_HEADERS}" CACHE PATH "") +SET(PYINTERP_INSTALL_RES "${PYCONSOLE_INSTALL_RES}" CACHE PATH "") OPTION(PYINTERP_BUILD_WITH_QT5 "Build PYCONSOLE with Qt 5" ${PYCONSOLE_BUILD_WITH_QT5}) ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/../PyInterp ${PROJECT_BINARY_DIR}/PyInterp) -- 2.39.2