From de108fee24e766acc454784ac5d1124086ff93be Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 14 Oct 2015 18:29:38 +0300 Subject: [PATCH] Windows compatibility --- CMakeLists.txt | 4 ++++ doc/dev/conf.py.in | 2 +- test/standalone/src/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 702a78bb..d6d8ef30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,10 @@ FIND_PACKAGE(SalomePython REQUIRED) FIND_PACKAGE(SalomeHDF5 REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED) +IF(NOT SALOME_LIGHT_ONLY) + FIND_PACKAGE(SalomeOmniORB REQUIRED) +ENDIF() + IF(SALOME_BUILD_DOC) FIND_PACKAGE(SalomeDoxygen) FIND_PACKAGE(SalomeGraphviz) diff --git a/doc/dev/conf.py.in b/doc/dev/conf.py.in index 7d80d78c..5edc80e2 100644 --- a/doc/dev/conf.py.in +++ b/doc/dev/conf.py.in @@ -103,7 +103,7 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. -#html_theme = 'omadoc' +html_theme = 'classic' html_theme_options = { "stickysidebar": "false", "rightsidebar": "false", diff --git a/test/standalone/src/CMakeLists.txt b/test/standalone/src/CMakeLists.txt index 550e8319..3b35cb43 100644 --- a/test/standalone/src/CMakeLists.txt +++ b/test/standalone/src/CMakeLists.txt @@ -71,6 +71,6 @@ ADD_EXECUTABLE(paraLight ${pl_FORMS_HEADERS} ${rcs_sources}) -TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents) +TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeTypeOpenGL) #INSTALL(TARGET paraLight bin) -- 2.39.2