Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ADIOS2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
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
Podhorszki, Norbert
ADIOS2
Commits
ba975dd4
Commit
ba975dd4
authored
7 years ago
by
Atkins, Charles Vernon
Browse files
Options
Downloads
Patches
Plain Diff
CMake: Fix BUILD_SHARED_LIBS inconsistency with gtest
parent
65f28efe
No related branches found
No related tags found
1 merge request
!236
Fix misc mac issues
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+2
-10
2 additions, 10 deletions
CMakeLists.txt
thirdparty/GTest/CMakeLists.txt
+1
-0
1 addition, 0 deletions
thirdparty/GTest/CMakeLists.txt
with
3 additions
and
10 deletions
CMakeLists.txt
+
2
−
10
View file @
ba975dd4
...
...
@@ -59,18 +59,10 @@ include(CMakeDependentOption)
# to that. Otherwise base the default on whether or not shared libs are even
# supported.
get_property
(
SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS
)
if
(
DEFINED ADIOS2_BUILD_SHARED_LIBS
)
set
(
ADIOS2_BUILD_SHARED_LIBS_DEFAULT
${
ADIOS2_BUILD_SHARED_LIBS
}
)
elseif
(
DEFINED BUILD_SHARED_LIBS
)
set
(
ADIOS2_BUILD_SHARED_LIBS_DEFAULT
${
BUILD_SHARED_LIBS
}
)
else
()
set
(
ADIOS2_BUILD_SHARED_LIBS_DEFAULT
${
SHARED_LIBS_SUPPORTED
}
)
endif
()
cmake_dependent_option
(
ADIOS2_BUILD_SHARED_LIBS
"Build shared libraries (so/dylib/dll)."
${
ADIOS2_BUILD_SHARED_LIBS_DEFAULT
}
cmake_dependent_option
(
BUILD_SHARED_LIBS
"Build shared libraries (so/dylib/dll)."
${
SHARED_LIBS_SUPPORTED
}
"SHARED_LIBS_SUPPORTED"
OFF
)
set
(
BUILD_SHARED_LIBS
${
ADIOS2_BUILD_SHARED_LIBS
}
)
mark_as_advanced
(
BUILD_SHARED_LIBS
)
# Setup PIC defaults. If explicitly specified somehow, then default
...
...
This diff is collapsed.
Click to expand it.
thirdparty/GTest/CMakeLists.txt
+
1
−
0
View file @
ba975dd4
...
...
@@ -2,4 +2,5 @@ set(BUILD_GTEST ON)
set
(
BUILD_GMOCK OFF
)
set
(
gtest_disable_pthreads ON
)
set
(
CMAKE_POLICY_DEFAULT_CMP0042 NEW
)
add_subdirectory
(
googletest EXCLUDE_FROM_ALL
)
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