Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mojtaba Abdolkhani
ogs
Commits
bdc312ec
Commit
bdc312ec
authored
6 years ago
by
Dmitri Naumov
Browse files
Options
Downloads
Patches
Plain Diff
Update CMake files for googletest submodule.
parent
8d3ae195
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
Tests/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Tests/CMakeLists.txt
ThirdParty/CMakeLists.txt
+1
-1
1 addition, 1 deletion
ThirdParty/CMakeLists.txt
scripts/cmake/SubmoduleSetup.cmake
+2
-1
2 additions, 1 deletion
scripts/cmake/SubmoduleSetup.cmake
with
5 additions
and
4 deletions
CMakeLists.txt
+
1
−
1
View file @
bdc312ec
...
@@ -309,7 +309,7 @@ endif()
...
@@ -309,7 +309,7 @@ endif()
# Add subdirectories with the projects
# Add subdirectories with the projects
add_subdirectory
(
ThirdParty
)
add_subdirectory
(
ThirdParty
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/gtest/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/g
oogletest/google
test/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/autocheck/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/autocheck/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/tclap/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/tclap/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/json/include
)
include_directories
(
SYSTEM
${
CMAKE_CURRENT_SOURCE_DIR
}
/ThirdParty/json/include
)
...
...
This diff is collapsed.
Click to expand it.
Tests/CMakeLists.txt
+
1
−
1
View file @
bdc312ec
...
@@ -39,7 +39,7 @@ set_target_properties(testrunner PROPERTIES FOLDER Testing)
...
@@ -39,7 +39,7 @@ set_target_properties(testrunner PROPERTIES FOLDER Testing)
target_link_libraries
(
testrunner
target_link_libraries
(
testrunner
ApplicationsFileIO
ApplicationsFileIO
GT
est
gt
est
MeshGeoToolsLib
MeshGeoToolsLib
MaterialLib
MaterialLib
MeshLib
MeshLib
...
...
This diff is collapsed.
Click to expand it.
ThirdParty/CMakeLists.txt
+
1
−
1
View file @
bdc312ec
...
@@ -17,7 +17,7 @@ if(MSVC)
...
@@ -17,7 +17,7 @@ if(MSVC)
set_target_properties
(
logog PROPERTIES COMPILE_FLAGS /W0
)
set_target_properties
(
logog PROPERTIES COMPILE_FLAGS /W0
)
endif
()
endif
()
add_subdirectory
(
gtest
)
add_subdirectory
(
g
oogle
test
)
# This is a workaround for Travis builds.
# This is a workaround for Travis builds.
option
(
OGS_USE_OPTIONAL_SUBMODULES
"Option for enabling optional submodules"
OFF
)
option
(
OGS_USE_OPTIONAL_SUBMODULES
"Option for enabling optional submodules"
OFF
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/SubmoduleSetup.cmake
+
2
−
1
View file @
bdc312ec
...
@@ -7,9 +7,10 @@ endif()
...
@@ -7,9 +7,10 @@ endif()
set
(
REQUIRED_SUBMODULES
set
(
REQUIRED_SUBMODULES
ThirdParty/autocheck
ThirdParty/autocheck
ThirdParty/cmake-modules
ThirdParty/cmake-modules
ThirdParty/
vtkdiff
ThirdParty/
googletest
ThirdParty/tclap
ThirdParty/tclap
ThirdParty/tetgen
ThirdParty/tetgen
ThirdParty/vtkdiff
${
OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT
}
${
OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT
}
)
)
if
(
OGS_BUILD_UTILS
)
if
(
OGS_BUILD_UTILS
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment