From: adv Date: Fri, 15 Nov 2013 07:17:07 +0000 (+0000) Subject: Linking libraries corrected. X-Git-Tag: BR_hydro_v_0_3~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e55d1238c471b9e94b25443d804e75c8cd14ea5d;p=modules%2Fhydro.git Linking libraries corrected. --- diff --git a/src/HYDROCurveCreator/CMakeLists.txt b/src/HYDROCurveCreator/CMakeLists.txt index 69a3994a..5b29efdf 100644 --- a/src/HYDROCurveCreator/CMakeLists.txt +++ b/src/HYDROCurveCreator/CMakeLists.txt @@ -6,7 +6,7 @@ include(../../CMake/UseQT4EXT.cmake) # additional include directories INCLUDE_DIRECTORIES( - ${QT_INCLUDE_DIRS} + ${QT_INCLUDES} ${PTHREAD_INCLUDE_DIR} ${CAS_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} @@ -23,10 +23,12 @@ ADD_DEFINITIONS( # libraries to link to SET(_link_LIBRARIES + ${QT_LIBRARIES} + ${qtx} + ${suit} + ${OCCViewer} ${GEOM_GEOMUtils} - ${GUI_qtx} - ${GUI_suit} - ${GUI_OCCViewer} + ${CAS_TKV3d} ${CAS_TKBRep} ${CAS_TKService} ) # --- headers --- diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt index 390d9070..e8bcaaf8 100644 --- a/src/HYDROGUI/CMakeLists.txt +++ b/src/HYDROGUI/CMakeLists.txt @@ -128,7 +128,7 @@ include_directories( add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC}) target_link_libraries(HYDROGUI HYDROData HYDROCurveCreator - ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO} ${CAS_TKService} + ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBO} ${CAS_TKService} ${LightApp} ${CAM} ${suit} ${qtx} ${ObjBrowser} ${GraphicsView} ${std} ${Event} ${OCCViewer} )