Merge branch 'V8_5_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a316b74f26c39f208d5a859a6aae07e2f82edd7..ca0969776a11125caf5885edf4e8dfed51117d83 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 11ca52fa7011a9be3d705b9c65c7bd50d953aa3f..7728d30ff82e25be323dd83ed801b8ade1d1c651 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -89,9 +89,11 @@ PROJECT( ParaMEDCorba )
       ${ParaMEDCorba_SOURCE_DIR}/testParaMEDCorba.cxx
       )
     # SET_TARGET_PROPERTIES(testCorbaPlugin PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
-    
+
+    # RNV: ${vtkgl2ps_LIBRARIES} was added for Fedora 26 OS    
     TARGET_LINK_LIBRARIES( testParaMEDCorba
       ParaMEDCorbaPlugin
+      ${vtkgl2ps_LIBRARIES}
       )
     
     INSTALL(FILES ParaMEDCorbaServerManager.xml DESTINATION share)

diff --git a/test/standalone/gui/CMakeLists.txt b/test/standalone/gui/CMakeLists.txt
index a0be32385b977791ad977c0592b390d5c2f64cfe..56190768ff251f33682e90c6b6763cb94f6ef5df 100644 (file)
--- a/test/standalone/gui/CMakeLists.txt
+++ b/test/standalone/gui/CMakeLists.txt
@@ -71,7 +71,8 @@ ADD_EXECUTABLE(paraLight
     ${pl_HEADERS_MOC} 
     ${pl_FORMS_HEADERS}
     ${rcs_sources})
-    
-TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)
+
+# RNV: ${vtkgl2ps_LIBRARIES} was added for Fedora 26 OS    
+TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle ${vtkgl2ps_LIBRARIES})
 #INSTALL(TARGET paraLight bin)
 

diff --git a/test/standalone/simple/CMakeLists.txt b/test/standalone/simple/CMakeLists.txt
index 61c0fb8b05d93d08a8879d57ffe42dab8f6c7676..d74d98adf340f35885f13c0cf6fa1846414b2c4a 100644 (file)
--- a/test/standalone/simple/CMakeLists.txt
+++ b/test/standalone/simple/CMakeLists.txt
@@ -32,5 +32,6 @@ INCLUDE_DIRECTORIES(
   )
 
 ADD_EXECUTABLE(paraCmdLine ${pl_SOURCES})
-TARGET_LINK_LIBRARIES(paraCmdLine ${PYTHON_LIBRARIES} ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)
+# RNV: ${vtkgl2ps_LIBRARIES} was added for Fedora 26 OS
+TARGET_LINK_LIBRARIES(paraCmdLine ${PYTHON_LIBRARIES} ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle ${vtkgl2ps_LIBRARIES})