From 1c27be7d28655cb4537aecbacb3a634f36b4d7fa Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Fri, 10 May 2013 21:27:14 +0000 Subject: [PATCH] update CMake for good configure with osg git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5442 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 187e9480caaecdc53e8b877ffb6baa6dba3be5c2 Former-commit-id: e5e4bf2d54dfbde32a43eed6a91f06bf61067b68 --- cmake/customthirdparty.cmake | 4 ++-- cmake/thirdpartydeps.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/customthirdparty.cmake b/cmake/customthirdparty.cmake index f7ec0ab27..0898c6738 100644 --- a/cmake/customthirdparty.cmake +++ b/cmake/customthirdparty.cmake @@ -140,8 +140,8 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR) _FIND_3RDPARTY_DEPENDENCY(OSGFX osgFX/version "" osgFX ${ROOT_DIR} "") _FIND_3RDPARTY_DEPENDENCY(OSGGA osgGA/export "" osgGA ${ROOT_DIR} "") _FIND_3RDPARTY_DEPENDENCY(OSG osg/viewport "" osg ${ROOT_DIR} "") - _FIND_3RDPARTY_DEPENDENCY(OSGPARTICLE osgParticle/PArticle "" osg ${ROOT_DIR} "") - _FIND_3RDPARTY_DEPENDENCY(OSGSHADOW osgShadow/ShadowedScene "" osg ${ROOT_DIR} "") + _FIND_3RDPARTY_DEPENDENCY(OSGPARTICLE osgParticle/Particle "" osgParticle ${ROOT_DIR} "") + _FIND_3RDPARTY_DEPENDENCY(OSGSHADOW osgShadow/ShadowedScene "" osgShadow ${ROOT_DIR} "") _FIND_3RDPARTY_DEPENDENCY(OSGVIEWER osgViewer/api/Win32/GraphicsHandleWin32 "" osgViewer ${ROOT_DIR} "") _FIND_3RDPARTY_DEPENDENCY(OSGUTIL osgUtil/Optimizer "" osgUtil ${ROOT_DIR} "") diff --git a/cmake/thirdpartydeps.cmake b/cmake/thirdpartydeps.cmake index 2f753cf04..9f702450c 100644 --- a/cmake/thirdpartydeps.cmake +++ b/cmake/thirdpartydeps.cmake @@ -77,7 +77,7 @@ MACRO(ADD_OSG_INCLUDEDIR) IF(NOT OPENSCENEGRAPH_FOUND) FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX - osgParticle OsgShadow) + osgParticle OsgShadow) ENDIF(NOT OPENSCENEGRAPH_FOUND) IF(OPENSCENEGRAPH_FOUND) @@ -92,7 +92,7 @@ MACRO(ADD_OSG_LIBRARY TARGET) IF(NOT OPENSCENEGRAPH_FOUND) FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX - osgParticle osgShadow) + osgParticle osgShadow) ENDIF(NOT OPENSCENEGRAPH_FOUND) IF(OPENSCENEGRAPH_FOUND)