]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Tools : paths were not properly passed to the sub CMake project.
authorabn <adrien.bruneton@cea.fr>
Tue, 21 Jun 2016 14:35:42 +0000 (16:35 +0200)
committerabn <adrien.bruneton@cea.fr>
Tue, 21 Jun 2016 14:35:42 +0000 (16:35 +0200)
tools/CMakeLists.txt
tools/PyConsole/CMakeLists.txt

index 1ca8dc33bda54dae129c17191b46c0e114275ef0..8013abd2d2d6d5d2957f2a6962c9b5a7c4ee7088 100755 (executable)
@@ -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
index 136b81e9b5f5c4d6823ff07e31abb4898f14f21d..30f21888b22d34a22d4475a6c9701393a2d53ad8 100644 (file)
@@ -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)