Windows compatibility

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 702a78bb44f2fba7ab54e55b1e12b7e08c5beb53..d6d8ef30f08253b78a39eeeb3fd19cf6d31fdade 100644 (file)
--- 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 7d80d78cdbd67bf866f132b9ab8b05a9a05e3cb0..5edc80e27490b9a5f2c679f1aad46f514af5bc19 100644 (file)
--- 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 550e83198f00df0d01aa7bce04399e70813a9681..3b35cb43539bfdac20e8ba0694740225831bf017 100644 (file)
--- 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)