|
|
|
@ -361,9 +361,9 @@ if (NOT WIN32 AND NOT APPLE)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
# CXX Compiler settings
|
|
|
|
|
set(CMAKE_CXX_STANDARD 11)
|
|
|
|
|
set(CMAKE_CXX_STANDARD 14)
|
|
|
|
|
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
|
|
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -std=c++11 -pedantic -Wno-long-long")
|
|
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -pedantic -Wno-long-long")
|
|
|
|
|
add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS=ON )
|
|
|
|
|
|
|
|
|
|
if (APPLE)
|
|
|
|
@ -507,7 +507,7 @@ if(WIN32)
|
|
|
|
|
|
|
|
|
|
INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/Debug/resources" DESTINATION "." CONFIGURATIONS Debug)
|
|
|
|
|
INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/Release/resources" DESTINATION "." CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FILE(GLOB plugin_dir_debug "${OpenMW_BINARY_DIR}/Debug/osgPlugins-*")
|
|
|
|
|
FILE(GLOB plugin_dir_release "${OpenMW_BINARY_DIR}/Release/osgPlugins-*")
|
|
|
|
|
INSTALL(DIRECTORY ${plugin_dir_debug} DESTINATION "." CONFIGURATIONS Debug)
|
|
|
|
@ -893,4 +893,3 @@ if (DOXYGEN_FOUND)
|
|
|
|
|
WORKING_DIRECTORY ${OpenMW_BINARY_DIR}
|
|
|
|
|
COMMENT "Generating documentation for the github-pages at ${DOXYGEN_PAGES_OUTPUT_DIR}" VERBATIM)
|
|
|
|
|
endif ()
|
|
|
|
|
|
|
|
|
|