OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux build of caf unit tests

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-12-03 15:00:25 +01:00
parent 8cd2d37b92
commit b06097862f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
View File

@ -6,7 +6,7 @@ find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Gui Widgets) find_package(Qt5 CONFIG REQUIRED Core Gui Widgets)
else() else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED) find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)

7
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
View File

@ -1,16 +1,15 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required (VERSION 2.8.12)
project ( cafPdmXml_UnitTests )
find_package(Qt5Core CONFIG QUIET) find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Xml) find_package(Qt5 CONFIG REQUIRED Core Xml)
else() else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED) find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
project ( cafPdmXml_UnitTests )
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )

6
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
View File

@ -1,15 +1,15 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required (VERSION 2.8.12)
project ( cafProjectDataModel_UnitTests )
find_package(Qt5Core CONFIG QUIET) find_package(Qt5Core CONFIG QUIET)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core Xml) find_package(Qt5 CONFIG REQUIRED Core Xml)
else() else()
find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED) find_package(Qt4 COMPONENTS QtCore QtXml REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
project ( cafProjectDataModel_UnitTests )
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )