FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Lugi Calori, tweaks to macros and addition of CMAKE_INSTALL_PREFIX to FindOpenThreads

Browse Source
This commit is contained in:
Robert Osfield
2007-03-08 15:33:50 +00:00
parent db6f07f1d6
commit 59e6b6c82e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeModules/FindOpenThreads.cmake
View File

@@ -21,7 +21,9 @@
# #include <OpenThreads/Thread>
# Try the user's environment request before anything else.
FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
${CMAKE_INSTALL_PREFIX}/include
$ENV{OPENTHREADS_DIR}/include
$ENV{OSG_DIR}/include
~/Library/Frameworks
@@ -37,8 +39,9 @@ FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
NAMES OpenThreads OpenThreadsd OpenThreadsWin32 OpenThreadsWin32d
PATHS
${CMAKE_INSTALL_PREFIX}/lib
$ENV{OPENTHREADS_DIR}/lib
$ENV{OSG_DIR}/lib
~/Library/Frameworks

6
CMakeModules/OsgMacroUtils.cmake
View File

@@ -210,10 +210,10 @@ ENDMACRO(GET_TARGETNAME)
MACRO(ADD_OSG_PLUGIN SUBDIR)
GET_TARGETNAME(${SUBDIR} TARGET)
# MESSAGE("globbing in -->${PROJECT_SOURCE_DIR}/${SUBDIR}<--")
FILE(GLOB PLUGIN_SRC ${PROJECT_SOURCE_DIR}/${SUBDIR}/*.cpp)
FILE(GLOB PLUGIN_H ${PROJECT_SOURCE_DIR}/${SUBDIR}/*.h)
FILE(GLOB PLUGIN_SRC ${OPENSCENEGRAPH_DIR}/src/osgPlugins/${SUBDIR}/*.cpp)
FILE(GLOB PLUGIN_H ${OPENSCENEGRAPH_DIR}/src/osgPlugins/${SUBDIR}/*.h)
#ADD_LIBRARY(${TARGET} SHARED ${PLUGIN_SRC} ${PLUGIN_H})
ADD_LIBRARY(${TARGET} MODULE ${PLUGIN_SRC} ${PLUGIN_H})
IF(NOT MSVC)