Skip to content

Commit

Permalink
Update Googletest Framework Parameter to Offline & Provide the Path V…
Browse files Browse the repository at this point in the history
…ariable (#15)

* Change Google Test Framework workflow to Offline
Changes to be committed:
	modified:   .github/workflows/cmake-multi-platform.yml
* Add path to find the offline Google Test Framework
  • Loading branch information
franziska-wegner authored Dec 7, 2023
1 parent 8683b0b commit 3ee97be
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ jobs:
-DEGOA_ENABLE_VERBOSE_MAKEFILE=ON
-DEGOA_PEDANTIC_AS_ERRORS=OFF
-DEGOA_PEDANTIC_MODE=ON
-DEGOA_TEST_FRAMEWORK=OnlineGoogleTestFramework
-DEGOA_TEST_FRAMEWORK_LOCATION=external/googletest
-DEGOA_TEST_FRAMEWORK=OfflineGoogleTestFramework
-DEGOA_TEST_FRAMEWORK_LOCATION=external/GoogleTestFramework
-DEGOA_THREAD_LIMIT=0
-DEGOA_WARNINGS_AS_ERRORS=ON
-DBONMIN_ROOT_DIR="NONE-DIR"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ endif ( EGOA_ENABLE_BOOST )
if ( EGOA_ENABLE_TESTS )
include ( CTest )
if ( EGOA_TEST_FRAMEWORK STREQUAL "OfflineGoogleTestFramework" )
find_package ( GoogleTestFramework )
find_package ( GoogleTestFramework PATHS ${EGOA_TEST_FRAMEWORK_LOCATION})
elseif ( EGOA_TEST_FRAMEWORK STREQUAL "OnlineGoogleTestFramework" )
find_package ( GoogleTestFrameworkOnlineVersion )
else ()
Expand Down

0 comments on commit 3ee97be

Please sign in to comment.