Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
[modules/hydro.git]
/
src
/
HYDRO_tests
/
CMakeLists.txt
diff --git
a/src/HYDRO_tests/CMakeLists.txt
b/src/HYDRO_tests/CMakeLists.txt
index e446a72cbe8e0b10e93467bddf59674f410ea404..9c940fb6ba63362697c47293bf32a827b7d40626 100644
(file)
--- a/
src/HYDRO_tests/CMakeLists.txt
+++ b/
src/HYDRO_tests/CMakeLists.txt
@@
-3,6
+3,8
@@
ADD_SUBDIRECTORY(reference_data)
include(../../CMake/Common.cmake)
include(ExternalFiles.cmake)
include(../../CMake/Common.cmake)
include(ExternalFiles.cmake)
+set (CMAKE_POSITION_INDEPENDENT_CODE ON)
+
set(PROJECT_HEADERS
test_HYDROData_Bathymetry.h
test_HYDROData_Channel.h
set(PROJECT_HEADERS
test_HYDROData_Bathymetry.h
test_HYDROData_Channel.h
@@
-68,7
+70,7
@@
set(PROJECT_SOURCES
TestLib_Runner.cxx
)
TestLib_Runner.cxx
)
-add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -DTEST_MODE )
+add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -DTEST_MODE
-DQT_GUI_LIB -DQT_WIDGETS_LIB
)
IF( ${WIN32} )
add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
IF( ${WIN32} )
add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
@@
-83,11
+85,11
@@
SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
SET( ECW_INCLUDES $ENV{ECWLIB_ROOT_DIR}/include )
IF( ${WIN32} )
SET( ECW_INCLUDES $ENV{ECWLIB_ROOT_DIR}/include )
IF( ${WIN32} )
- link_directories( $ENV{CASROOT}/win64/vc10/lib )
+ link_directories( $ENV{CASROOT}/win64/vc10/lib
$ENV{GL2PS_DIR}/lib
)
ELSE()
link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
ENDIF()
ELSE()
link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
ENDIF()
-SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )
+SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh
gl2ps
)
link_directories( $ENV{QT_ROOT_DIR}/lib $ENV{QTDIR}/lib )
IF( ${WIN32} )
link_directories( $ENV{QT_ROOT_DIR}/lib $ENV{QTDIR}/lib )
IF( ${WIN32} )
@@
-113,7
+115,7
@@
link_directories( $ENV{KERNEL_ROOT_DIR}/lib/salome $ENV{GUI_ROOT_DIR}/lib/salome
SET( GUI_LIBRARIES ImageComposer qtx suit CAM OCCViewer GraphicsView )
# Please do not link with LightApp since in the full SALOME it is linked with CORBA (omniORB)
SET( GUI_LIBRARIES ImageComposer qtx suit CAM OCCViewer GraphicsView )
# Please do not link with LightApp since in the full SALOME it is linked with CORBA (omniORB)
-SET( GEOM_LIBRARIES CurveCreator GEOMUtils
GEOMUtils
)
+SET( GEOM_LIBRARIES CurveCreator GEOMUtils )
link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
IF( ${WIN32} )
link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
IF( ${WIN32} )
@@
-138,6
+140,7
@@
include_directories(
source_group( "External files" FILES ${EXTERNAL_FILES} )
add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
source_group( "External files" FILES ${EXTERNAL_FILES} )
add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
-target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib HYDROData ${ECW_LIBRARIES} )
+set_target_properties( HYDROData_tests PROPERTIES LINK_INTERFACE_LIBRARIES "" )
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib ${ECW_LIBRARIES} )
INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})