bos #37534:

 - ensure SalomeApprc_utils compiles on Windows
 -  ensure LightApp links on Windows
 - support SALOMEBOOTSTRAP on Windows

diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt
index fed477d56a0e000bcb6aa7d8f5ca502a92bc68b6..55172bee0f94826828406a50794667eb1d05c5b4 100644 (file)
--- a/src/LightApp/CMakeLists.txt
+++ b/src/LightApp/CMakeLists.txt
@@ -102,7 +102,6 @@ ENDIF()
 IF(SALOME_USE_PYCONSOLE)
   ADD_DEFINITIONS(${PYTHON_DEFINITIONS})
 ENDIF()
-
 # libraries to link to
 SET(_link_LIBRARIES
   ${OpenCASCADE_FoundationClasses_LIBRARIES}
@@ -325,8 +324,13 @@ ENDIF()
 SET(LightApp_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_rcc_SOURCES})
 
 # --- rules ---
-
 ADD_LIBRARY(LightApp ${LightApp_SOURCES})
+
+IF(WIN32)
+  # Ensure that SalomeApprc_utils static library is a prerequisite
+  Add_dependencies (LightApp SalomeApprc_utils SalomeApprc_utils_lib)
+ENDIF(WIN32)
+
 TARGET_LINK_LIBRARIES(LightApp ${_link_LIBRARIES})
 INSTALL(TARGETS LightApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 

diff --git a/src/SalomeApprc_utils/CMakeLists.txt b/src/SalomeApprc_utils/CMakeLists.txt
index a3cb30024b269b0e56182dfac17e0d60eff6d7dd..968c2bd5bfb13bbe845d5f313ee71b7900298fd3 100644 (file)
--- a/src/SalomeApprc_utils/CMakeLists.txt
+++ b/src/SalomeApprc_utils/CMakeLists.txt
@@ -57,9 +57,15 @@ QT5_WRAP_CPP(_moc_SOURCES SalomeApprc_utils.cxx)
 # --- rules ---
 
 ADD_LIBRARY(SalomeApprc_utils SalomeApprc_utils.cxx)
-
 TARGET_LINK_LIBRARIES(SalomeApprc_utils ${_link_LIBRARIES})
 INSTALL(TARGETS SalomeApprc_utils EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
-#INSTALL(TARGETS suit EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+if(WIN32)
+   MESSAGE(STATUS "Add SalomeApprc_utils static library")
+  add_library(SalomeApprc_utils_lib STATIC  SalomeApprc_utils.cxx)
+  TARGET_LINK_LIBRARIES(SalomeApprc_utils_lib ${_link_LIBRARIES})
+  set_target_properties(SalomeApprc_utils_lib PROPERTIES OUTPUT_NAME SalomeApprc_utils)
+  INSTALL(TARGETS SalomeApprc_utils_lib DESTINATION ${SALOME_INSTALL_LIBS})
+endif(WIN32)
 
 INSTALL(FILES ${SalomeApprc_utils_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})