speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

- fix CMakeLists.txt in osggraph

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4997 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 3dd824bbce6360c20993579533a16cc6f9e2382d
Former-commit-id: c3006e5c3a1669d42dd288315e32f982043893dd
This commit is contained in:
torcs-ng 2012-10-14 16:51:09 +00:00
parent 39c8a9083f
commit 1a6cb18e34
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/modules/graphic/osggraph/CMakeLists.txt
View file

@ -1,7 +1,7 @@
INCLUDE(../../../../cmake/macros.cmake) INCLUDE(../../../../cmake/macros.cmake)
SET(SSGGRAPH_HEADERS grmain.h osggraph.h) SET(OSGGRAPH_HEADERS grmain.h osggraph.h)
SET(SSGGRAPH_SOURCES grmain.cpp osggraph.cpp) SET(OSGGRAPH_SOURCES grmain.cpp osggraph.cpp)
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()
ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient robottools) ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient robottools)
@ -14,11 +14,16 @@ ENDIF(COMMAND CMAKE_POLICY)
IF(WIN32) IF(WIN32)
# DLL export stuff under Windows (to avoid .def file) # DLL export stuff under Windows (to avoid .def file)
ADD_DEFINITIONS(-DOSGGRAPH_DLL) ADD_DEFINITIONS(-DOSGGRAPH_DLL)
# Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
ENDIF(WIN32) ENDIF(WIN32)
IF(MSVC)
# Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
ENDIF(MSVC)
# Note: Other sources and headers needed for having them available in IDEs.
ADD_LIBRARY(osggraph SHARED ${OSGGRAPH_SOURCES} ${OSGGRAPH_HEADERS} ${OSGGRAPH_OTHER_SOURCES})
# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) # Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose)
#SET_TARGET_PROPERTIES(ssggraph PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) #SET_TARGET_PROPERTIES(ssggraph PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0)
@ -26,11 +31,8 @@ IF(UNIX OR MINGW)
SET_TARGET_PROPERTIES(osggraph PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(osggraph PROPERTIES PREFIX "")
ENDIF(UNIX OR MINGW) ENDIF(UNIX OR MINGW)
ADD_LIBRARY(osggraph SHARED ${OSGGRAPH_SOURCES}) #ADD_OSG_LIBRARY(osggraph osgviewer osgFX osgGA osgUtils osgDB OpenThreads osg)
ADD_OSG_LIBRARY(osggraph osgviewer osgFX osgGA osgUtils osgDB OpenThreads osg)
ADD_SDL_LIBRARY(osggraph) ADD_SDL_LIBRARY(osggraph)
ADD_SDLIB_LIBRARY(osggraph tgf tgfclient robottools) ADD_SDLIB_LIBRARY(osggraph tgf tgfclient robottools)
find_package(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX) find_package(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX)