SALOME 9.1.0 Windows version

diff --git a/cmake/FindCGNS.cmake b/cmake/FindCGNS.cmake
index 8c2fd14bf0d2acff08185a8f35a877778c4c0ff5..9f3235bd25a0b38514e54023a1eb9161160ee519 100644 (file)
--- a/cmake/FindCGNS.cmake
+++ b/cmake/FindCGNS.cmake
@@ -40,7 +40,11 @@ IF(CGNS_ROOT_DIR)
 ENDIF(CGNS_ROOT_DIR)
 
 FIND_PATH(CGNS_INCLUDE_DIRS cgnslib.h)
-FIND_LIBRARY(CGNS_LIBRARIES NAMES cgns)
+IF(WIN32)
+  FIND_LIBRARY(CGNS_LIBRARIES NAMES cgnsdll)
+ELSE()
+  FIND_LIBRARY(CGNS_LIBRARIES NAMES cgns)
+ENDIF()
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CGNS REQUIRED_VARS CGNS_INCLUDE_DIRS CGNS_LIBRARIES)

diff --git a/cmake/FindMESHGEMS.cmake b/cmake/FindMESHGEMS.cmake
index 40f8e3e7fc844f46c518311a99467924684a65d8..b1b3f20bdbbd32ae792429df8e98044fc8299dd4 100644 (file)
--- a/cmake/FindMESHGEMS.cmake
+++ b/cmake/FindMESHGEMS.cmake
@@ -35,7 +35,11 @@ MESSAGE(STATUS "Check for MESHGEMS ...")
 SET(MESHGEMS_ROOT_DIR $ENV{MESHGEMS_ROOT_DIR})
 
 IF(MESHGEMS_ROOT_DIR)
+IF(WIN32)
+  LIST(APPEND CMAKE_PREFIX_PATH "${MESHGEMS_ROOT_DIR}/Products")
+ELSE()
   LIST(APPEND CMAKE_PREFIX_PATH "${MESHGEMS_ROOT_DIR}")
+ENDIF()
 ENDIF(MESHGEMS_ROOT_DIR)
 
 FIND_PATH(MESHGEMS_INCLUDE_DIRS meshgems/cadsurf.h PATH_SUFFIXES include)
@@ -45,8 +49,8 @@ IF(MACHINE_IS_64)
 ELSE()
   SET(_suff)
 ENDIF(MACHINE_IS_64)
-IF(WIN32)      
-  SET(_plt Win7${_suff}_VC9 Win7${_suff}_VC10 WinXP${_suff}_VC9 WinXP${_suff}_VC10)
+IF(WIN32)
+  SET(_plt Win7${_suff}_VC9 Win7${_suff}_VC10 Win7${_suff}_VC14 WinXP${_suff}_VC9 WinXP${_suff}_VC10)
 ELSE()
   SET(_plt Linux${_suff})
 ENDIF(WIN32)

diff --git a/cmake/FindPThread.cmake b/cmake/FindPThread.cmake
index f06e8656146b10d04d37b1ce20e723b94b9488b1..5cc56d6378ff99ce3886c128d7035e4e8a98b5ca 100644 (file)
--- a/cmake/FindPThread.cmake
+++ b/cmake/FindPThread.cmake
@@ -46,12 +46,7 @@ ENDIF ()
 IF(WIN32)
     SET(PTHREADS_INCLUDE_TO_FIND pthread.h)
     FIND_PATH(PTHREAD_INCLUDE_DIR ${PTHREADS_INCLUDE_TO_FIND})
-    # Default build type is assumed to be Release:
-    IF(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
-        FIND_LIBRARY(PTHREAD_LIBRARIES pthreadVC2)
-    ELSE()
-        FIND_LIBRARY(PTHREAD_LIBRARIES pthreadVC2d)
-    ENDIF()
+    FIND_LIBRARY(PTHREAD_LIBRARIES NAMES pthreadVC2 pthreadVC2d)
 ELSE(WIN32)
     FIND_PATH(PTHREAD_INCLUDE_DIR pthread.h)
     FIND_LIBRARY(PTHREAD_LIBRARIES NAMES pthread)

diff --git a/cmake/FindSalomeHDF5.cmake b/cmake/FindSalomeHDF5.cmake
index 276ea8ed2287f150a18cc8a0c1e863b0089ca84a..7972742a281577a76a895ad55ac19211ea306586 100644 (file)
--- a/cmake/FindSalomeHDF5.cmake
+++ b/cmake/FindSalomeHDF5.cmake
@@ -40,9 +40,11 @@ MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB HDF5_DIR)
 SET(HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIRS};${HDF5_INCLUDE_DIR}")
 # Same story with libraries - if in CONFIG mode, HDF5_LIBRARIES is not defined:
 IF(NOT DEFINED HDF5_LIBRARIES)
-  IF(TARGET hdf5)
-    SET(HDF5_LIBRARIES hdf5)
-  ENDIF()
+    IF(TARGET hdf5)
+      SET(HDF5_LIBRARIES hdf5)
+    ELSEIF(TARGET hdf5::hdf5-shared)
+      SET(HDF5_LIBRARIES hdf5::hdf5-shared)
+    ENDIF()
 ENDIF()
 
 ##

diff --git a/cmake/FindSalomeOmniORB.cmake b/cmake/FindSalomeOmniORB.cmake
index 88baba219fdcfdea916942f1f259e2c120e488ae..f0792e1a5ff90c2c0a70e03ca22d40f32465790d 100644 (file)
--- a/cmake/FindSalomeOmniORB.cmake
+++ b/cmake/FindSalomeOmniORB.cmake
@@ -31,4 +31,8 @@ IF(OMNIORB_FOUND)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORB_LIBRARIES})
   SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORB_LIBRARIES}
                                            ${OMNIORB_PYTHONPATH})
+  IF(WIN32) 
+    GET_FILENAME_COMPONENT(_OMNI_BIN ${OMNIORB_IDL_COMPILER} PATH)
+    SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${_OMNI_BIN})
+  ENDIF()
 ENDIF()
\ No newline at end of file

diff --git a/cmake/FindSalomeOpenCASCADE.cmake b/cmake/FindSalomeOpenCASCADE.cmake
index 684f4a24c9fe7f1a796d16de324f76eff4de108a..d37150b647ddfb741e46088853cf9b6bffd6b09a 100644 (file)
--- a/cmake/FindSalomeOpenCASCADE.cmake
+++ b/cmake/FindSalomeOpenCASCADE.cmake
@@ -25,7 +25,11 @@
 #
 
 # TODO: RNV: Check different OCCT layouts !!!
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCASCADE OpenCASCADE_INCLUDE_DIR 2)
+IF(WIN32)
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCASCADE OpenCASCADE_INCLUDE_DIR 1)
+ELSE()
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCASCADE OpenCASCADE_INCLUDE_DIR 2)
+ENDIF()
 
 IF(OpenCASCADE_FOUND)
   

diff --git a/cmake/FindSalomeOpenCV.cmake b/cmake/FindSalomeOpenCV.cmake
index aa0049c0575536a5b63ac496b1114fe2e1200fd2..322fbe7bf2eb92289eb2f34457b8caded8b4dd6f 100644 (file)
--- a/cmake/FindSalomeOpenCV.cmake
+++ b/cmake/FindSalomeOpenCV.cmake
@@ -36,4 +36,8 @@ IF(OpenCV_FOUND)
   IF(NOT OPENCV_INCLUDE_DIR AND OpenCV_INCLUDE_DIRS)
     SET(OPENCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS})
   ENDIF()
+  MARK_AS_ADVANCED(FORCE OPENCV_INCLUDE_DIR OpenCV_LIBRARIES)
+  # RNV: Why opencv-2.4.13.5 stores *_FOUND variables into CACHE ???
+  UNSET(OpenCV_FOUND CACHE)
+  UNSET(OPENCV_FOUND CACHE)
 ENDIF()

diff --git a/cmake/FindSalomePythonLibs.cmake b/cmake/FindSalomePythonLibs.cmake
index dc244f799fed6c5f338224a85bc4bc7588087d3c..1402f0cd1a3f9ed6e3ce76d96dd3c2a1d088bbb8 100644 (file)
--- a/cmake/FindSalomePythonLibs.cmake
+++ b/cmake/FindSalomePythonLibs.cmake
@@ -36,7 +36,8 @@ IF (SALOMEPYTHONINTERP_FOUND AND NOT "${PYTHON_VERSION_STRING}" STREQUAL "")
    SET(PythonLibs_FIND_VERSION_MAJOR ${PYTHON_VERSION_MAJOR})
 ENDIF()
 IF(WIN32)
-  set(CMAKE_LIBRARY_PATH "${PYTHON_ROOT_DIR}/libs")
+  SET(CMAKE_LIBRARY_PATH "${PYTHON_ROOT_DIR}/libs")
+  SET(PYTHON_INCLUDE_DIR "${PYTHON_ROOT_DIR}/include")
 ENDIF()
 IF(APPLE)
   FIND_PROGRAM(PYTHON_CONFIG_EXECUTABLE python-config)

diff --git a/cmake/FindSalomeSWIG.cmake b/cmake/FindSalomeSWIG.cmake
index 4ebed737eae184c7d4058d465bd705628f3c315c..bcd9aed436a474a503677cff937b2cd056b7b481 100644 (file)
--- a/cmake/FindSalomeSWIG.cmake
+++ b/cmake/FindSalomeSWIG.cmake
@@ -27,8 +27,11 @@
 # Workaround about stupid CMake bug that find_program performs search by iterating through names at first place
 # instead of paths!!!
 FIND_PROGRAM(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig HINTS $ENV{SWIG_ROOT_DIR} PATH_SUFFIXES bin NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
-
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 2)
+IF(WIN32)
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 1)
+ELSE()
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 2)
+ENDIF()
 MARK_AS_ADVANCED(SWIG_EXECUTABLE SWIG_VERSION)
 
 IF(SWIG_FOUND) 

diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
index a54038517d268fde4b64675c9b3a8518c0ef5162..16976d56b38258c14357ea0ff2c114361d1a0783 100644 (file)
--- a/cmake/FindSphinx.cmake
+++ b/cmake/FindSphinx.cmake
@@ -60,7 +60,7 @@ INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE SPHINX_APIDOC_EXECUTABLE SPHINX_INTL_EXECUTABLE)
 
 FOREACH(_ext ${Sphinx_EXTENSIONS})
-  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import ${_ext}; print 'ok'" OUTPUT_VARIABLE _has_ext ERROR_QUIET)
+  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import ${_ext}; print('ok')" OUTPUT_VARIABLE _has_ext ERROR_QUIET)
   IF(_has_ext)
     MESSAGE(STATUS "Required Sphinx extension '${_ext}' has been found!")
   ELSE()

diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake
index d91eb4c932b1ed9c8a3dc1f620ee6da71fd98d4c..02e1b31b3ed5793be1e77117b5a83da77ed95fa1 100644 (file)
--- a/cmake/SalomeMacros.cmake
+++ b/cmake/SalomeMacros.cmake
@@ -1007,9 +1007,16 @@ MACRO(SWIG_CHECK_GENERATION swig_module)
   echo The file @SWIG_GEN_FILE_NAME@ is still being created !!! & goto :check
 )
 :eof")
-    LIST(LENGTH swig_generated_sources NB_GEN_FILES)
+    SET(W_LIST)
+    LIST(LENGTH swig_generated_sources NB_GEN_FILES)  
+    IF(NOT ${NB_GEN_FILES})
+      LIST(LENGTH swig_generated_file_fullname NB_GEN_FILES)
+      SET(W_LIST ${swig_generated_file_fullname})
+    ELSE()
+      SET(W_LIST ${swig_generated_sources})
+    ENDIF()
     IF(${NB_GEN_FILES})
-      LIST(GET swig_generated_sources 0 SWIG_GEN_FILE_NAME)
+      LIST(GET W_LIST 0 SWIG_GEN_FILE_NAME)
       STRING(CONFIGURE ${SCRIPT} SCRIPT)
       GET_FILENAME_COMPONENT(SWIG_GEN_FILE_NAME_DIR ${SWIG_GEN_FILE_NAME} DIRECTORY)
       GET_FILENAME_COMPONENT(SWIG_GEN_FILE_NAME_WE ${SWIG_GEN_FILE_NAME} NAME_WE)

diff --git a/cmake/UseSphinx.cmake b/cmake/UseSphinx.cmake
index 1ee25d18bebb22770ad49e75df60f4a8dde95508..b30a2a858d35fb2657e99362d801a4bd45c09ff0 100644 (file)
--- a/cmake/UseSphinx.cmake
+++ b/cmake/UseSphinx.cmake
@@ -105,7 +105,7 @@ MACRO(ADD_MULTI_LANG_DOCUMENTATION)
         IF(${_item} STREQUAL "LD_LIBRARY_PATH")
           SET(_item PATH)
         ENDIF()
-        STRING(REPLACE "/" "\\" _env "${_env} @SET ${_item}=${_val};%${_item}%\n")        
+        STRING(REPLACE "/" "\\" _env "${_env} @SET ${_item}=${_val}\;%${_item}%\n")        
       ELSEIF(APPLE)
         IF(${_item} STREQUAL "LD_LIBRARY_PATH")
           SET(_env "${_env} export DYLD_LIBRARY_PATH=${_val}:\${DYLD_LIBRARY_PATH}\n")