Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly link in cmake

Browse source
This commit is contained in:
Atlante45 2014-10-22 13:11:45 -07:00
parent ccc8e0d876
commit ad2eb08964
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/modules/FindGverb.cmake
View file

@ -32,8 +32,7 @@ endif (GVERB_INCLUDE_DIRS)
if (GVERB_FOUND) if (GVERB_FOUND)
message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}") message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}")
else () else (GVERB_FOUND)
message(FATAL_ERROR "Could NOT find Gverb. Read ./interface/externals/gverb/readme.txt") message(FATAL_ERROR "Could NOT find Gverb. Read ./interface/externals/gverb/readme.txt")
endif () endif (GVERB_FOUND)
endif ()

14
interface/CMakeLists.txt
View file

@ -18,13 +18,6 @@ find_package(Qt5LinguistToolsMacros)
# As Gverb is currently the only reverb library, it's required. # As Gverb is currently the only reverb library, it's required.
find_package(Gverb REQUIRED) find_package(Gverb REQUIRED)
if (GVERB_FOUND)
file(GLOB GVERB_SRCS ${GVERB_SRC_DIRS}/*.c)
include_directories(${GVERB_INCLUDE_DIRS})
add_library(Gverb ${GVERB_SRCS})
message(STATUS "Gverb srcs: ${GVERB_SRCS}")
endif (GVERB_FOUND)
if (DEFINED ENV{JOB_ID}) if (DEFINED ENV{JOB_ID})
set(BUILD_SEQ $ENV{JOB_ID}) set(BUILD_SEQ $ENV{JOB_ID})
else () else ()
@ -177,6 +170,13 @@ if (QXMPP_FOUND AND NOT DISABLE_QXMPP AND WIN32)
add_definitions(-DQXMPP_STATIC) add_definitions(-DQXMPP_STATIC)
endif () endif ()
if (GVERB_FOUND)
file(GLOB GVERB_SRCS ${GVERB_SRC_DIRS}/*.c)
include_directories(${GVERB_INCLUDE_DIRS})
add_library(gverb STATIC ${GVERB_SRCS})
target_link_libraries(${TARGET_NAME} gverb)
endif (GVERB_FOUND)
# include headers for interface and InterfaceConfig. # include headers for interface and InterfaceConfig.
include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes") include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")