cmake:narrow scope of DATADIR

This will be moved to the data repo cmake
This commit is contained in:
andy5995
2018-10-04 14:15:04 -05:00
parent c67286636f
commit e936e95abc

View File

@@ -227,7 +227,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
string(TOUPPER "${CMAKE_BUILD_TYPE}" ZG_BUILD_TYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" ZG_BUILD_TYPE)
add_definitions("-DDATADIR=${INSTALL_DIR_DATA}")
SET(CMAKE_CXX_FLAGS_{ZG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}}") SET(CMAKE_CXX_FLAGS_{ZG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}}")
# We do some funky character escaping to get the right stuff written out to # We do some funky character escaping to get the right stuff written out to
@@ -328,6 +327,8 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans") MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
ENDIF() ENDIF()
# FIXME: This should output all defines. For example, DATADIR is defined in
# the glest_game source and sharedlib cmake file as well
get_directory_property( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) get_directory_property( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
foreach( d ${DirDefs} ) foreach( d ${DirDefs} )
message( STATUS "=====> Found Define: " ${d} ) message( STATUS "=====> Found Define: " ${d} )