Adaptation of HYDRO to standard procedure of building SALOME modules on Windows platform

diff --git a/CMake/CommonInstall.cmake b/CMake/CommonInstall.cmake
index 5e6a62c0c3729e398977c9344106cd295d79f6b1..93f23a5e9cd5c42518e906f97e1fc5a7bf6663b8 100644 (file)
--- a/CMake/CommonInstall.cmake
+++ b/CMake/CommonInstall.cmake
@@ -1,2 +1,2 @@
-install(TARGETS ${PROJECT_LIBRARIES} RUNTIME DESTINATION bin/salome LIBRARY DESTINATION lib/salome)
+install(TARGETS ${PROJECT_LIBRARIES} DESTINATION lib/salome)
 install(FILES ${PROJECT_HEADERS} DESTINATION include)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 029935f1e6c55e90f9e4d8d5567a6d3b377153a0..7dd75c5520840079221fd2a2a81db860cd5f3838 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 2.6)
 
 project (HYDRO)
 
+IF(WINDOWS)
+  ADD_DEFINITIONS(-DWNT)
+ENDIF(WINDOWS)
+
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
   INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 39d804ed791e28e183a641a40e8948500aef509b..3b9f345a24839ad5f4c6e1897e9df837263fd060 100644 (file)
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(
 )
 
 add_library(HYDROData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-target_link_libraries(HYDROData ${CAS_OCAF})
+target_link_libraries(HYDROData ${CAS_OCAF} ${QT_LIBRARIES})
 
 set(PROJECT_LIBRARIES HYDROData)
 

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 44f68a464878df222e212bdc8e2b104241b0282e..b7ccdae9a0d586361026fe9ea23ac711bb7e40c6 100644 (file)
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -96,7 +96,11 @@ include_directories(
 )
 
 add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI ${CAS_OCAF} HYDROData HYDROOperations -L${GEOM_ROOT_DIR}/lib/salome/ -lCurveCreator)
+target_link_libraries(HYDROGUI HYDROData HYDROOperations 
+    ${CAS_TKV3d}
+    ${LightApp} ${CAM} ${suit} ${qtx} ${ObjBrowser} ${GraphicsView} ${std} ${Event} ${OCCViewer}
+    ${CurveCreator}
+    )
 
 set(PROJECT_LIBRARIES HYDROGUI)
 
@@ -115,3 +119,4 @@ FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
 FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
 SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA})
 INSTALL(FILES ${GUI_DATA} DESTINATION ${HYDRO_salomeres_DATA})
+

diff --git a/src/HYDROOperations/CMakeLists.txt b/src/HYDROOperations/CMakeLists.txt
index a6a8ac077e8079b4eadca7a443dbaa8f0405e247..8dda9f0fe42ecd7298ab9857b69bc34b124eeb03 100644 (file)
--- a/src/HYDROOperations/CMakeLists.txt
+++ b/src/HYDROOperations/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(
 )
 
 add_library(HYDROOperations SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-target_link_libraries(HYDROOperations ${CAS_MODELER} ${ImageComposer} HYDROData)
+target_link_libraries(HYDROOperations ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${ImageComposer} HYDROData)
 
 set(PROJECT_LIBRARIES HYDROOperations)
 

diff --git a/src/HYDROOperations/HYDROOperations_BSpline.h b/src/HYDROOperations/HYDROOperations_BSpline.h
index 20b9c85980a7a38d6d278e6b6162de6c70f6466f..0fb9134f1f874ee4df9234b03c96da40e456176e 100644 (file)
--- a/src/HYDROOperations/HYDROOperations_BSpline.h
+++ b/src/HYDROOperations/HYDROOperations_BSpline.h
@@ -14,13 +14,13 @@
  * manipulation and conversion.
  */
 
-class HYDROOperations_BSpline
+class HYDROOPERATIONS_EXPORT HYDROOperations_BSpline
 {
 public:
 
   //! Creates a spline by list of coordinates: pairs X and Y
   //! \param thePoints coordinates in format X1, Y1, X2, Y2, etc. must be even number of elements
-  HYDROOPERATIONS_EXPORT HYDROOperations_BSpline(QList<double>& thePoints);
+  HYDROOperations_BSpline(QList<double>& thePoints);
   
   //! Returns the BSpline curve passing through the points
   //! \returns Null if Computation of BSpline was failed