Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

get past assignment-client build after cmake auditing

Browse source
This commit is contained in:
Stephen Birarda 2014-08-07 16:13:29 -07:00
parent 2bb37f2d64
commit 892e30c5e1
14 changed files with 57 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assignment-client/CMakeLists.txt
View file

@ -9,6 +9,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake
include("${MACRO_DIR}/SetupHifiProject.cmake") include("${MACRO_DIR}/SetupHifiProject.cmake")
setup_hifi_project(${TARGET_NAME} TRUE) setup_hifi_project(${TARGET_NAME} TRUE)
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} "${ROOT_DIR}")
# link in the shared libraries # link in the shared libraries
include(${MACRO_DIR}/LinkHifiLibrary.cmake) include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
@ -26,13 +29,20 @@ link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
if (UNIX) if (UNIX)
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS}) list(APPEND DEPENDENCY_LIBRARIES ${CMAKE_DL_LIBS})
endif (UNIX) endif (UNIX)
IF (WIN32) IF (WIN32)
target_link_libraries(${TARGET_NAME} Winmm Ws2_32) list(APPEND DEPENDENCY_LIBRARIES Winmm Ws2_32)
ENDIF(WIN32) ENDIF(WIN32)
find_package(Qt5 COMPONENTS Gui Network Script Widgets)
# set a property indicating the libraries we are dependent on and link them to ourselves
list(APPEND DEPENDENCY_LIBRARIES Qt5::Gui Qt5::Network Qt5::Script Qt5::Widgets)
set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
# add a definition for ssize_t so that windows doesn't bail # add a definition for ssize_t so that windows doesn't bail
if (WIN32) if (WIN32)
add_definitions(-Dssize_t=long) add_definitions(-Dssize_t=long)

52
interface/CMakeLists.txt
View file

@ -52,7 +52,7 @@ foreach(SUBDIR avatar devices renderer ui starfield location scripting voxels pa
set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}") set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}")
endforeach(SUBDIR) endforeach(SUBDIR)
find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools) # find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools)
# grab the ui files in resources/ui # grab the ui files in resources/ui
file (GLOB_RECURSE QT_UI_FILES ui/*.ui) file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
@ -182,8 +182,6 @@ include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes"
target_link_libraries( target_link_libraries(
${TARGET_NAME} ${TARGET_NAME}
"${ZLIB_LIBRARIES}" "${ZLIB_LIBRARIES}"
Qt5::Core Qt5::Gui Qt5::Multimedia Qt5::Network Qt5::OpenGL
Qt5::Script Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::UiTools
) )
# assume we are using a Qt build without bearer management # assume we are using a Qt build without bearer management
@ -191,30 +189,30 @@ add_definitions(-DQT_NO_BEARERMANAGEMENT)
if (APPLE) if (APPLE)
# link in required OS X frameworks and include the right GL headers # link in required OS X frameworks and include the right GL headers
find_library(AppKit AppKit) # find_library(AppKit AppKit)
find_library(CoreAudio CoreAudio) # find_library(CoreAudio CoreAudio)
find_library(CoreServices CoreServices) # find_library(CoreServices CoreServices)
find_library(Carbon Carbon) # find_library(Carbon Carbon)
find_library(Foundation Foundation) # find_library(Foundation Foundation)
find_library(GLUT GLUT) # find_library(GLUT GLUT)
find_library(OpenGL OpenGL) # find_library(OpenGL OpenGL)
find_library(IOKit IOKit) # find_library(IOKit IOKit)
find_library(QTKit QTKit) # find_library(QTKit QTKit)
find_library(QuartzCore QuartzCore) # find_library(QuartzCore QuartzCore)
#
target_link_libraries( # target_link_libraries(
${TARGET_NAME} # ${TARGET_NAME}
${AppKit} # ${AppKit}
${CoreAudio} # ${CoreAudio}
${CoreServices} # ${CoreServices}
${Carbon} # ${Carbon}
${Foundation} # ${Foundation}
${GLUT} # ${GLUT}
${OpenGL} # ${OpenGL}
${IOKit} # ${IOKit}
${QTKit} # ${QTKit}
${QuartzCore} # ${QuartzCore}
) # )
# install command for OS X bundle # install command for OS X bundle
INSTALL(TARGETS ${TARGET_NAME} INSTALL(TARGETS ${TARGET_NAME}

3
libraries/animation/CMakeLists.txt
View file

@ -13,8 +13,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
find_package(Qt5Script) find_package(Qt5 COMPONENTS Network Script)
find_package(Qt5Network)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Network) set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Network)

2
libraries/audio/CMakeLists.txt
View file

@ -20,7 +20,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
find_package(Qt5Network) find_package(Qt5 COMPONENTS Network)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Network) set(DEPENDENCY_LIBRARIES Qt5::Network)

4
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -15,9 +15,9 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include "PacketHeaders.h" #include <PacketHeaders.h>
#include "AudioRingBuffer.h"
#include "AudioRingBuffer.h"
AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode, int numFramesCapacity) : AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode, int numFramesCapacity) :
_frameCapacity(numFramesCapacity), _frameCapacity(numFramesCapacity),

6
libraries/audio/src/AudioRingBuffer.h
View file

@ -15,12 +15,10 @@
#include <limits> #include <limits>
#include <stdint.h> #include <stdint.h>
#include <glm/glm.hpp>
#include <QtCore/QIODevice> #include <QtCore/QIODevice>
#include "NodeData.h" #include <SharedUtil.h>
#include "SharedUtil.h" #include <NodeData.h>
const int SAMPLE_RATE = 24000; const int SAMPLE_RATE = 24000;

3
libraries/avatars/CMakeLists.txt
View file

@ -19,8 +19,7 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
find_package(Qt5Network) find_package(Qt5 COMPONENTS Network Script)
find_package(Qt5Script)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script) set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script)

2
libraries/embedded-webserver/CMakeLists.txt
View file

@ -9,7 +9,7 @@ set(TARGET_NAME embedded-webserver)
include(${MACRO_DIR}/SetupHifiLibrary.cmake) include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME}) setup_hifi_library(${TARGET_NAME})
find_package(Qt5Network REQUIRED) find_package(Qt5 COMPONENTS Network)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Network) set(DEPENDENCY_LIBRARIES Qt5::Network)

4
libraries/metavoxels/CMakeLists.txt
View file

@ -19,9 +19,7 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
include(${MACRO_DIR}/IncludeGLM.cmake) include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} "${ROOT_DIR}") include_glm(${TARGET_NAME} "${ROOT_DIR}")
find_package(Qt5Script) find_package(Qt5 COMPONENTS Network Script Widgets)
find_package(Qt5Widgets)
find_package(Qt5Network)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Widgets Qt5::Network) set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Widgets Qt5::Network)

3
libraries/models/CMakeLists.txt
View file

@ -24,8 +24,7 @@ link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
# for streamable # for streamable
link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
find_package(Qt5Network) find_package(Qt5 COMPONENTS Network Script)
find_package(Qt5Script)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script) set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script)

2
libraries/networking/CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(TARGET_NAME networking)
include(${MACRO_DIR}/SetupHifiLibrary.cmake) include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME}) setup_hifi_library(${TARGET_NAME})
find_package(Qt5Network) find_package(Qt5 COMPONENTS Network)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Network) set(DEPENDENCY_LIBRARIES Qt5::Network)

5
libraries/particles/CMakeLists.txt
View file

@ -19,11 +19,10 @@ link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
find_package(Qt5Network) find_package(Qt5 COMPONENTS Gui Network Script)
find_package(Qt5Script)
# set a property indicating the libraries we are dependent on and link them to ourselves # set a property indicating the libraries we are dependent on and link them to ourselves
set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script) set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script Qt5::Gui)
set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}") set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})

11
libraries/script-engine/CMakeLists.txt
View file

@ -6,8 +6,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
set(TARGET_NAME script-engine) set(TARGET_NAME script-engine)
find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/SetupHifiLibrary.cmake) include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME}) setup_hifi_library(${TARGET_NAME})
@ -23,11 +21,12 @@ link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
# link ZLIB find_package(Qt5 COMPONENTS Gui Network Script Widgets)
find_package(ZLIB)
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") # set a property indicating the libraries we are dependent on and link them to ourselves
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets) set(DEPENDENCY_LIBRARIES Qt5::Gui Qt5::Network Qt5::Script Qt5::Widgets)
set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
# add a definition for ssize_t so that windows doesn't bail # add a definition for ssize_t so that windows doesn't bail
if (WIN32) if (WIN32)

5
libraries/shared/CMakeLists.txt
View file

@ -20,10 +20,9 @@ elseif (UNIX)
set(DEPENDENCY_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") set(DEPENDENCY_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
endif () endif ()
find_package(Qt5Network) find_package(Qt5 COMPONENTS Network Widgets)
find_package(Qt5Widgets)
# bubble up the libraries we are dependent on and link them to ourselves # bubble up the libraries we are dependent on and link them to ourselves
list(APPEND DEPENDENCY_LIBRARIES Qt5::Network Qt5::Widgets) list(APPEND DEPENDENCY_LIBRARIES Qt5::Network Qt5::Widgets)
set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES ${DEPENDENCY_LIBRARIES}) set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})