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

Merge pull request #205 from LaurensVoerman/submitGTAcmake

Browse Source 
GTA: use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug lnk
This commit is contained in:
OpenSceneGraph git repository 2017-03-11 11:35:36 +00:00 committed by GitHub
commit fea86426ed
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeModules/FindGTA.cmake
View File

@ -16,9 +16,10 @@ IF(PKG_CONFIG_FOUND)
PKG_CHECK_MODULES(GTA gta) PKG_CHECK_MODULES(GTA gta)
ELSE(PKG_CONFIG_FOUND) ENDIF(PKG_CONFIG_FOUND)
FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp IF(NOT GTA_FOUND)
FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
$ENV{GTA_DIR}/include $ENV{GTA_DIR}/include
$ENV{GTA_DIR} $ENV{GTA_DIR}
~/Library/Frameworks ~/Library/Frameworks
@ -30,9 +31,9 @@ FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
/opt/csw/include # Blastwave /opt/csw/include # Blastwave
/opt/include /opt/include
/usr/freeware/include /usr/freeware/include
) )
FIND_LIBRARY(GTA_LIBRARIES FIND_LIBRARY(GTA_LIBRARY
NAMES gta libgta NAMES gta libgta
PATHS PATHS
$ENV{GTA_DIR}/lib $ENV{GTA_DIR}/lib
@ -46,11 +47,11 @@ FIND_LIBRARY(GTA_LIBRARIES
/opt/csw/lib /opt/csw/lib
/opt/lib /opt/lib
/usr/freeware/lib64 /usr/freeware/lib64
) )
SET(GTA_FOUND "NO") SET(GTA_FOUND "NO")
IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
SET(GTA_FOUND "YES") SET(GTA_FOUND "YES")
ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
ENDIF(PKG_CONFIG_FOUND) ENDIF(NOT GTA_FOUND)

2
src/osgPlugins/gta/CMakeLists.txt
View File

@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GTA_INCLUDE_DIRS} )
SET(TARGET_SRC ReaderWriterGTA.cpp ) SET(TARGET_SRC ReaderWriterGTA.cpp )
SET(TARGET_LIBRARIES_VARS GTA_LIBRARIES) SET(TARGET_LIBRARIES_VARS GTA_LIBRARY)
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(gta) SETUP_PLUGIN(gta)