diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index 208de57fd..d4652525f 100644 --- a/Engine/source/CMakeLists.txt +++ b/Engine/source/CMakeLists.txt @@ -155,6 +155,7 @@ endif (UNIX AND NOT APPLE) ################# Start building libs ################### +set(TORQUE_INCLUDE_DIRECTORIES "") set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING TORQUE_SHADERGEN TORQUE_OPCODE TORQUE_ASSIMP TORQUE_SDL TORQUE_COLLADA TORQUE_UNICODE UNICODE _UNICODE) @@ -198,10 +199,14 @@ if (TORQUE_OPENGL) set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_OPENGL) endif (TORQUE_OPENGL) -# Linux requires X11 +# Linux requires X11 & freetype if (UNIX AND NOT APPLE) set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} "X11") set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_PLATFORM_X11_SOURCES}) + + find_package(Freetype) + set(TORQUE_INCLUDE_DIRECTORIES ${TORQUE_INCLUDE_DIRECTORIES} ${FREETYPE_INCLUDE_DIRS}) + set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} ${FREETYPE_LIBRARIES}) endif (UNIX AND NOT APPLE) # Search module directories @@ -245,8 +250,8 @@ endif() target_compile_definitions(${TORQUE_APP_NAME} PUBLIC ${TORQUE_COMPILE_DEFINITIONS}) target_link_libraries(${TORQUE_APP_NAME} ${TORQUE_LINK_LIBRARIES}) -target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp") -set_property(TARGET ${TORQUE_APP_NAME} PROPERTY CXX_STANDARD 17) +target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES}) +target_compile_features(${TORQUE_APP_NAME} PRIVATE cxx_std_17) if (WIN32) set_target_properties(${TORQUE_APP_NAME} PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS /MP /Zc:wchar_t-")