Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed cmake issues and got the client building again
  • Loading branch information
andrewfenn committed Oct 4, 2015
1 parent 8652503 commit 837fad3
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 43 deletions.
46 changes: 20 additions & 26 deletions CMakeLists.txt
Expand Up @@ -9,11 +9,11 @@ set(HARDWAR_VERSION_STRING "${HARDWAR_MAJOR_VERSION}.${HARDWAR_MINOR_VERSION}.${
message(STATUS "Building Hardwar version ${HARDWAR_VERSION_STRING}")
set(abi_version ${HARDWAR_VERSION_STRING})

set(CMAKE_DISABLE_MESSAGE TRUE)

set(HARDWAR_LIBPATH "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${HARDWAR_LIBPATH}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${HARDWAR_LIBPATH}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${HARDWAR_LIBPATH}")
set(DEPENDENCIES_LIBPATH "${HARDWAR_LIBPATH}")
set(LIBRARY_OUTPUT_PATH "${HARDWAR_LIBPATH}")

set( CMAKE_MODULE_PATH
"${CMAKE_MODULE_PATH}"
Expand All @@ -22,19 +22,19 @@ set( CMAKE_MODULE_PATH
)

include(Build)
set(CMAKE_DISABLE_MESSAGE FALSE)

include(SourceFiles)
include(Windows)
include(OSX)

find_package(Boost COMPONENTS thread filesystem system)
set(Boost_USE_STATIC_LIBS TRUE)

find_package(OIS REQUIRED)

#set(DEPENDENCIES_LIBPATH "${HARDWAR_LIBPATH}")
#set(LIBRARY_OUTPUT_PATH "${HARDWAR_LIBPATH}")
find_package(OIS REQUIRED)

# Surpress Warnings from dependencies
# Surpress compiler warnings from dependencies
set(ORIGINAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")

Expand All @@ -46,24 +46,17 @@ set(TINYXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/TinyXML")
set(TINYXML_LIBRARIES "${DEPENDENCIES_LIBPATH}")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/TinyXML")

set(OGRE_STATIC FALSE)
set(OGRE_USE_BOOST TRUE)
set(OGRE_BUILD_TEST FALSE)
set(OGRE_BUILD_SAMPLES FALSE)
set(OGRE_BUILD_TOOLS FALSE)
set(OGRE_UNITY_BUILD TRUE)
set(OGRE_STATIC FALSE CACHE BOOL NULL FORCE)
set(OGRE_USE_BOOST TRUE CACHE BOOL NULL FORCE)
set(OGRE_BUILD_TEST FALSE CACHE BOOL NULL FORCE)
set(OGRE_BUILD_SAMPLES FALSE CACHE BOOL NULL FORCE)
set(OGRE_BUILD_TOOLS FALSE CACHE BOOL NULL FORCE)
set(OGRE_UNITY_BUILD TRUE CACHE BOOL NULL FORCE)
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ogre")
set_target_properties(OgreMain
RenderSystem_GL
Plugin_OctreeSceneManager
Plugin_BSPSceneManager
Plugin_CgProgramManager
Plugin_ParticleFX
Plugin_PCZSceneManager
OgrePaging
OgreTerrain
OgreRTShaderSystem
PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${HARDWAR_LIBPATH}")
set(OGRE_LIBRARIES OgreMain RenderSystem_GL Plugin_OctreeSceneManager Plugin_BSPSceneManager Plugin_CgProgramManager Plugin_ParticleFX Plugin_PCZSceneManager OgrePaging OgreTerrain OgreRTShaderSystem)


set_target_properties(${OGRE_LIBRARIES} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${HARDWAR_LIBPATH}")

set(HARDWAR_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/code/client/include")
set(DEPENDENCIES_INCLUDES
Expand All @@ -86,16 +79,17 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/poshlib")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/UnitTest++")
#add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/amop")

set(BUILD_PYTHON_BINDINGS FALSE)
set(BUILD_PYTHON_BINDINGS FALSE CACHE BOOL NULL FORCE)
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libRocket")

# Turn off messages from external librarie's cmake scripts
set(CMAKE_DISABLE_MESSAGE FALSE)

# Re-enable compiler warnings for hardwar code
set(CMAKE_CXX_FLAGS "${ORIGINAL_CMAKE_CXX_FLAGS}")

# client unit tests
#add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests/client")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests/client")

# client
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/code/client")
Expand Down
6 changes: 1 addition & 5 deletions cmake/scripts/Build.cmake
Expand Up @@ -18,12 +18,8 @@ message(STATUS "Build type set to: ${CMAKE_BUILD_TYPE}")
function(message)
list(GET ARGV 0 MessageType)
if(NOT CMAKE_DISABLE_MESSAGE)
if(MessageType STREQUAL FATAL_ERROR OR
MessageType STREQUAL SEND_ERROR OR
MessageType STREQUAL WARNING OR
MessageType STREQUAL AUTHOR_WARNING)
list(REMOVE_AT ARGV 0)
_message(${MessageType} "${ARGV}")
endif()
endif()
endfunction()
set(CMAKE_DISABLE_MESSAGE FALSE)
7 changes: 2 additions & 5 deletions code/client/CMakeLists.txt
Expand Up @@ -69,15 +69,12 @@ endif()

set_target_properties(client PROPERTIES SOLUTION_FOLDER "Hardwar Client")
target_link_libraries(client
${OGRE_LIBRARIES} ${OGRE_Terrain_LIBRARY} ${OGRE_Paging_LIBRARY}
${OGRE_LIBRARIES}
${OIS_LIBRARIES}
${Boost_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
RocketCore RocketControls RocketDebugger
)

if (UNIX)
add_definitions(-Wall -pedantic -Wextra -Wwrite-strings -std=c++11)
endif()

set(CMAKE_CXX_FLAGS "${ORIGINAL_CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wwrite-strings -std=c++11")
9 changes: 2 additions & 7 deletions tests/client/CMakeLists.txt
@@ -1,6 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_policy(SET CMP0003 NEW)

project(clientTest)

add_subdirectory("${CMAKE_SOURCE_DIR}/code/client/core/" "${CMAKE_CURRENT_BINARY_DIR}/client/core/")
Expand Down Expand Up @@ -56,8 +54,7 @@ add_dependencies(clientTest RocketControls)
add_dependencies(clientTest RocketDebugger)

target_link_libraries(clientTest
${OGRE_LIBRARIES} ${OGRE_Terrain_LIBRARY} ${OGRE_Paging_LIBRARY}
${CEGUI_LIBRARY}
${OGRE_LIBRARIES}
${Boost_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
Expand All @@ -66,9 +63,7 @@ target_link_libraries(clientTest
yaarg
)

if(UNIX)
add_definitions(-Wall -pedantic -Wextra -Wwrite-strings -std=c++11)
endif()
set(CMAKE_CXX_FLAGS "${ORIGINAL_CMAKE_CXX_FLAGS} -Wall -pthread -pedantic -Wextra -Wwrite-strings -std=c++14")

set_target_properties(clientTest PROPERTIES SOLUTION_FOLDER UnitTests)

Expand Down

0 comments on commit 837fad3

Please sign in to comment.