From d1af778ecb1cb098205321beff9ce8f5dabec7b1 Mon Sep 17 00:00:00 2001 From: jonjenssen Date: Mon, 5 Feb 2024 23:18:45 +0000 Subject: [PATCH] Fixes by cmake-format --- ApplicationExeCode/CMakeLists.txt | 2 +- ApplicationLibCode/CMakeLists.txt | 10 ++----- ApplicationLibCode/UnitTests/CMakeLists.txt | 29 ++++++++------------- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt index fd2a903d30..98e3deb165 100644 --- a/ApplicationExeCode/CMakeLists.txt +++ b/ApplicationExeCode/CMakeLists.txt @@ -271,7 +271,7 @@ set(LINK_LIBRARIES ${VIZ_FWK_LIBRARIES} ApplicationLibCode Commands - RigGeoMechDataModel + RigGeoMechDataModel RifGeoMechFileInterface ) diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt index 6361654ce4..82e15fe623 100644 --- a/ApplicationLibCode/CMakeLists.txt +++ b/ApplicationLibCode/CMakeLists.txt @@ -90,7 +90,6 @@ find_package(Eigen3 REQUIRED) # Defining all the source (and header) files # ############################################################################## - list( APPEND REFERENCED_CMAKE_FILES @@ -235,12 +234,8 @@ qt5_wrap_ui(FORM_FILES_CPP ${QT_UI_FILES}) # ############################################################################## source_group("ModelVisualization" FILES ${MODEL_VISUALIZATION_FILES}) -list( - APPEND - ALL_SOURCE_FILES - ${CPP_SOURCES} - ${MOC_SOURCE_FILES} - ${FORM_FILES_CPP} +list(APPEND ALL_SOURCE_FILES ${CPP_SOURCES} ${MOC_SOURCE_FILES} + ${FORM_FILES_CPP} ) add_library(${PROJECT_NAME} OBJECT ${ALL_SOURCE_FILES}) @@ -439,4 +434,3 @@ if(RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS) enable_testing() add_subdirectory(UnitTests) endif() - diff --git a/ApplicationLibCode/UnitTests/CMakeLists.txt b/ApplicationLibCode/UnitTests/CMakeLists.txt index aeebc152bf..7309a87a3c 100644 --- a/ApplicationLibCode/UnitTests/CMakeLists.txt +++ b/ApplicationLibCode/UnitTests/CMakeLists.txt @@ -1,4 +1,3 @@ - # ResInsight unit tests set(SOURCE_UNITTEST_FILES @@ -112,19 +111,18 @@ if(RESINSIGHT_USE_ODB_API_OBSOLETE) ) endif(RESINSIGHT_USE_ODB_API_OBSOLETE) - include(FetchContent) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.11.0 + GIT_TAG release-1.11.0 ) FetchContent_MakeAvailable(googletest) include(GoogleTest) -add_executable(ResInsight-tests ${SOURCE_UNITTEST_FILES} main.cpp ) +add_executable(ResInsight-tests ${SOURCE_UNITTEST_FILES} main.cpp) configure_file( ${CMAKE_CURRENT_LIST_DIR}/RiaTestDataDirectory.h.cmake @@ -132,11 +130,10 @@ configure_file( ) target_include_directories( - ResInsight-tests - PUBLIC ${CMAKE_BINARY_DIR}/Generated - "$" - ${RI_PRIVATE_INCLUDES} - ${PROJECT_SOURCE_DIR}/Commands + ResInsight-tests + PUBLIC ${CMAKE_BINARY_DIR}/Generated + "$" + ${RI_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/Commands ) target_compile_features(ResInsight-tests PRIVATE cxx_std_20) @@ -148,12 +145,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") list(APPEND THIRD_PARTY_LIBRARIES rt atomic) endif() -set(LINK_LIBRARIES - ApplicationLibCode - Commands - RigGeoMechDataModel - RifGeoMechFileInterface - ${THIRD_PARTY_LIBRARIES} +set(LINK_LIBRARIES ApplicationLibCode Commands RigGeoMechDataModel + RifGeoMechFileInterface ${THIRD_PARTY_LIBRARIES} ) if(RESINSIGHT_ENABLE_GRPC) @@ -164,8 +157,8 @@ if(RESINSIGHT_USE_ODB_API) list(APPEND LINK_LIBRARIES RifOdbReader) endif() -target_link_libraries(ResInsight-tests PUBLIC ${LINK_LIBRARIES} GTest::gtest_main ) +target_link_libraries( + ResInsight-tests PUBLIC ${LINK_LIBRARIES} GTest::gtest_main +) gtest_discover_tests(ResInsight-tests) - -