0027402: Fix Compilation with MinGw and Additional Libraries

Setting CSF_GL2PS in occt_csf.cmake in the same way as CSF_FREETYPE is set.

Added MinGw library suffix to a in 3rdparty_macro.cmake, freetype.cmake and tbb.cmake.

Removed redundant CSF_GL2PS definition for non-Win32 configurations

diff --git a/adm/cmake/3rdparty_macro.cmake b/adm/cmake/3rdparty_macro.cmake
index 8061ab19a5164b0169921259476385f24e682255..e77378289dd375be271516dcc3408891686a24c5 100644 (file)
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -115,7 +115,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
   if (BUILD_SHARED_LIBS)
     # library
     if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
 
       set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
       if (ANDROID)

diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake
index 63720e1d5b3dd64da9b21ecc09dde8094f7581ea..f3bc8df5a32a24be3c745a8465d1df10de196b24 100644 (file)
--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -220,7 +220,7 @@ endif()
 # freetype library
 if (BUILD_SHARED_LIBS)
   if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
 
     set (FREETYPE_PATH_SUFFIXES lib)
     if (ANDROID)

diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
index ebc505a86c8d32fae16c08c78e5bb7b837470d2b..26eb8a536e8c2689fd58b8b7465fbb148de53196 100644 (file)
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -44,6 +44,12 @@ if (WIN32)
     set (CSF_FREETYPE)
   endif()
 
+  if (USE_GL2PS)
+    set (CSF_GL2PS "gl2ps.lib")
+  else()
+    set (CSF_GL2PS)
+  endif()
+
   if (USE_FREEIMAGE)
     set (CSF_FreeImagePlus "freeimage.lib freeimageplus.lib")
   else()

diff --git a/adm/cmake/tbb.cmake b/adm/cmake/tbb.cmake
index be418a28afdd53e2c4288bcc9e21ccc1cca72aa9..8c9d12a907c5d5599abe613fa615f3a333120dfa 100644 (file)
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -129,7 +129,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_NAME)
   # tbb/tbbmalloc library
   if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
     
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
     set (PRODUCT_PATH_SUFFIXES lib ${lower_PRODUCT_NAME})
 
     # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY