OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 09:33:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix AppFwk dependencies

Browse Source
This commit is contained in:
Magne Sjaastad 2020-03-15 19:18:22 +01:00
parent e47192eaec
commit 502b08ea61
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp
View File

@ -394,6 +394,8 @@ TEST(BaseTest, FilePathSerializing)
delete s1; delete s1;
} }
// Type deduction is different on other platforms than Windows
#ifdef WIN32
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -429,5 +431,5 @@ TEST(BaseTest, TestDataType)
delete s1; delete s1;
} }
#endif

8
Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
View File

@ -85,10 +85,18 @@ if (USE_COMMAND_FRAMEWORK)
) )
endif(USE_COMMAND_FRAMEWORK) endif(USE_COMMAND_FRAMEWORK)
# According to ivarun this is needed on OpenSuse, and Fedora. See: https://github.com/OPM/ResInsight/pull/7
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list(APPEND EXTERNAL_LINK_LIBRARIES
rt
pthread
)
endif()
target_link_libraries ( ${PROJECT_NAME} target_link_libraries ( ${PROJECT_NAME}
${TAP_LINK_LIBRARIES} ${TAP_LINK_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${EXTERNAL_LINK_LIBRARIES}
) )
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})