Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
078546fb
Commit
078546fb
authored
May 24, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated gtest finder
parent
d691207a
Pipeline
#7039
failed with stage
in 4 minutes and 12 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
14 deletions
+19
-14
cmake/FindGoogleTest.cmake
cmake/FindGoogleTest.cmake
+19
-14
No files found.
cmake/FindGoogleTest.cmake
View file @
078546fb
...
...
@@ -45,7 +45,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
~/sw/gtest-1.8.0/include
~/sw/gtest-1.7.0/include
~/sw/gtest/include
/ACG/acgdev/gcc-
4.7-
x86_64/gtest/include
/ACG/acgdev/gcc-x86_64/gtest/include
/opt/local/include
/usr/local/include
/usr/include
...
...
@@ -56,10 +56,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
~/sw/gtest-1.8.0/lib
~/sw/gtest-1.7.0/lib
~/sw/gtest/lib
/ACG/acgdev/gcc-
4.7-
x86_64/gtest/lib
/ACG/acgdev/gcc-x86_64/gtest/lib
/opt/local/lib
/usr/local/lib
/usr/
lib
/usr/
include
"C:/libs/win32/gtest/lib"
NO_DEFAULT_PATH
)
find_library
(
_GTEST_MAIN_LIBRARY gtest_main
...
...
@@ -67,10 +67,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
~/sw/gtest-1.8.0/lib
~/sw/gtest-1.7.0/lib
~/sw/gtest/lib
/ACG/acgdev/gcc-
4.7-
x86_64/gtest/lib
/ACG/acgdev/gcc-x86_64/gtest/lib
/opt/local/lib
/usr/local/lib
/usr/
lib
/usr/
include
"C:/libs/win32/gtest/lib"
NO_DEFAULT_PATH
)
...
...
@@ -84,24 +84,29 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
set
(
GTEST_INCLUDE_DIRS
${
_GTEST_INCLUDE_DIR
}
CACHE PATH
"Include directories for Google Test framework"
)
if
(
NOT WIN32
)
if
(
NOT WIN32
)
set
(
GTEST_LIBRARIES
${
_GTEST_LIBRARY
}
CACHE FILEPATH
"Libraries to link for Google Test framework"
)
set
(
GTEST_MAIN_LIBRARIES
${
_GTEST_MAIN_LIBRARY
}
CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition"
)
else
()
set
(
GTEST_LIBRARIES
"optimized;gtest;debug;gtestd"
CACHE FILEPATH
set
(
GTEST_MAIN_LIBRARY
${
_GTEST_MAIN_LIBRARY
}
CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition"
)
else
()
set
(
GTEST_LIBRARIES
"optimized;gtest;debug;gtestd"
CACHE FILEPATH
"Libraries to link for Google Test framework"
)
set
(
GTEST_MAIN_LIBRARIES
"optimized;gtest_main;debug;gtest_maind"
CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition"
)
endif
()
set
(
GTEST_MAIN_LIBRARY
"optimized;gtest_main;debug;gtest_maind"
CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition"
)
endif
()
# Macro required to use google test with vs2012
if
(
CMAKE_GENERATOR MATCHES
"^Visual Studio 11.*"
)
add_definitions
(
-D_VARIADIC_MAX=10
)
endif
()
# Macro required to use google test with vs2012
if
(
CMAKE_GENERATOR MATCHES
"^Visual Studio 11.*"
)
add_definitions
(
-D_VARIADIC_MAX=10
)
endif
()
set
(
GTEST_LIBRARY
${
_GTEST_LIBRARY
}
CACHE FILEPATH
"GTest Libraries"
)
set
(
GTEST_LIBRARY_DIR
${
_GTEST_LIBRARY_DIR
}
CACHE FILEPATH
"Library dir containing Google Test libraries"
)
mark_as_advanced
(
GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment