Skip to content

Commit fde0fc0

Browse files
committed
Merge branch 'weethreads' of github.com:gwaldron/osgearth into weethreads
2 parents 7b3405c + 456230e commit fde0fc0

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

CMakeModules/oe_unix.cmake

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
IF(UNIX AND NOT ANDROID)
44
# Not sure what this will do on Cygwin and Msys
55
# Also, remember OS X X11 is a user installed option so it may not exist.
6-
find_library(X11)
7-
6+
FIND_PACKAGE(X11)
87
# Some Unicies need explicit linkage to the Math library or the build fails.
9-
find_library(MATH_LIBRARY m)
10-
11-
# for pthreads
12-
find_library(Threads)
13-
8+
FIND_LIBRARY(MATH_LIBRARY m)
9+
# for ptheads in linux
10+
find_package(Threads REQUIRED)
1411
ENDIF(UNIX AND NOT ANDROID)

src/applications/osgearth_features/osgearth_features.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ using namespace osgEarth::Util;
4141

4242
int usage( const std::string& app )
4343
{
44-
OE_NOTICE "\n" << app << "\n"
44+
OE_NOTICE << "\n" << app << "\n"
4545
<< " --rasterize : draw features as rasterized image tiles \n"
4646
<< " --drape : draw features as projected texture \n"
4747
<< " --clamp : draw features using shader clamping \n"

src/osgEarth/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,10 @@ IF (TRACY_FOUND)
980980
LINK_WITH_VARIABLES(${LIB_NAME} TRACY_LIBRARY)
981981
ENDIF(TRACY_FOUND)
982982

983+
if(UNIX)
984+
target_link_libraries(${LIB_NAME} PUBLIC Threads::Threads)
985+
endif()
986+
983987
OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
984988
if(NOT NRL_STATIC_LIBRARIES)
985989
LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)

0 commit comments

Comments
 (0)