From 129761ea995128a166b0eb5bf4b02256d94a3323 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 10 Oct 2018 02:06:28 +0300 Subject: [PATCH] fix build of gta plugin when pkg-config is used + update related variable for build without pkg-config Tested during cross-compilation for MS Windows using MinGW. --- CMakeModules/FindGTA.cmake | 6 +++--- src/osgPlugins/gta/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules/FindGTA.cmake b/CMakeModules/FindGTA.cmake index 086069c32..e483ad3c5 100644 --- a/CMakeModules/FindGTA.cmake +++ b/CMakeModules/FindGTA.cmake @@ -33,7 +33,7 @@ IF(NOT GTA_FOUND) /usr/freeware/include ) - FIND_LIBRARY(GTA_LIBRARY + FIND_LIBRARY(GTA_LIBRARIES NAMES gta libgta PATHS $ENV{GTA_DIR}/lib @@ -50,8 +50,8 @@ IF(NOT GTA_FOUND) ) SET(GTA_FOUND "NO") - IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS) + IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) SET(GTA_FOUND "YES") - ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS) + ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) ENDIF(NOT GTA_FOUND) \ No newline at end of file diff --git a/src/osgPlugins/gta/CMakeLists.txt b/src/osgPlugins/gta/CMakeLists.txt index 2b910a628..16466fefc 100644 --- a/src/osgPlugins/gta/CMakeLists.txt +++ b/src/osgPlugins/gta/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GTA_INCLUDE_DIRS} ) SET(TARGET_SRC ReaderWriterGTA.cpp ) -SET(TARGET_LIBRARIES_VARS GTA_LIBRARY) +SET(TARGET_LIBRARIES_VARS GTA_LIBRARIES) #### end var setup ### SETUP_PLUGIN(gta)