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

Cleaned up and improved how files are included from CMakeLists_files.cmake

Browse Source 
p4#: 20616
This commit is contained in:
Magne Sjaastad 2013-02-26 09:38:33 +01:00
parent 1a235529ac
commit 2b5bea7a4a
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
View File

@ -20,33 +20,34 @@ include_directories(
${ResInsight_SOURCE_DIR}/CommonCode ${ResInsight_SOURCE_DIR}/CommonCode
) )
# Populate variables from read from CMakeLists_files.cmake
set (CODE_SOURCE_FILES )
include ("${ResInsight_SOURCE_DIR}/ApplicationCode/FileInterface/CMakeLists_files.cmake") include ("${ResInsight_SOURCE_DIR}/ApplicationCode/FileInterface/CMakeLists_files.cmake")
set( FILEINTERFACE_CPP_SOURCES set( CPP_SOURCES
${CPP_SOURCES}
${CODE_SOURCE_FILES} ${CODE_SOURCE_FILES}
) )
source_group( "FileInterface" FILES ${CODE_SOURCE_FILES} )
set( RESERVOIRDATAMODEL_CPP_SOURCES
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigCell.cpp # Populate variables from read from CMakeLists_files.cmake
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigGridBase.cpp set (CODE_SOURCE_FILES )
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigLocalGrid.cpp include ("${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake")
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp set( CPP_SOURCES
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp ${CPP_SOURCES}
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp ${CODE_SOURCE_FILES}
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp )
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigWellResults.cpp source_group( "ReservoirDataModel" FILES ${CODE_SOURCE_FILES} )
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp
set( CPP_SOURCES
${CPP_SOURCES}
${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp ${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp
) )
set( CPP_SOURCES source_group( "Headers" FILES ${CODE_HEADER_FILES} )
${FILEINTERFACE_CPP_SOURCES}
${RESERVOIRDATAMODEL_CPP_SOURCES}
)
source_group( "FileInterface" FILES ${FILEINTERFACE_CPP_SOURCES} )
source_group( "ReservoirDataModel" FILES ${RESERVOIRDATAMODEL_CPP_SOURCES} )
set( UNIT_TEST_CPP_SOURCES set( UNIT_TEST_CPP_SOURCES
main.cpp main.cpp
@ -54,7 +55,6 @@ set( UNIT_TEST_CPP_SOURCES
Ert-Test.cpp Ert-Test.cpp
) )
set( LINK_LIBRARIES set( LINK_LIBRARIES
CommonCode CommonCode
@ -71,20 +71,22 @@ set( LINK_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
add_executable( ${ProjectName} add_executable( ${ProjectName}
${CODE_HEADER_FILES}
${CPP_SOURCES} ${CPP_SOURCES}
${UNIT_TEST_CPP_SOURCES} ${UNIT_TEST_CPP_SOURCES}
${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
${ResInsight_SOURCE_DIR}/ApplicationCode/FileInterface/CMakeLists_files.cmake
${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
) )
set( EXTERNAL_LINK_LIBRARIES ${ERT_LIBRARY_LIST} ) set( EXTERNAL_LINK_LIBRARIES ${ERT_LIBRARY_LIST} )
target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES}) target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})
# Copy Dlls # Copy Dlls
if (MSVC) if (MSVC)
@ -97,21 +99,4 @@ if (MSVC)
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>) ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
endforeach( qtlib ) endforeach( qtlib )
# DLLs ERT depends on
# add_custom_command(TARGET ${ProjectName} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_directory
# "${PROJECT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/bin/"
# ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
# ERT DLLs
# set (ERT_MODULES ecl geometry util well)
# foreach (ert_module ${ERT_MODULES})
# add_custom_command(TARGET ${ProjectName} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_if_different
# "${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/${ert_module}/lib/lib${ert_module}.dll"
# ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
# endforeach()
endif(MSVC) endif(MSVC)