From 2836b3d1bdb32765950b8e3133a2452d8e7b98d2 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 13 Sep 2019 00:41:03 +0800 Subject: cmake: generate position independent code, add missing include dirs. --- extensions/CMakeLists.txt | 9 ++++----- smelt/glfw/CMakeLists.txt | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 8bc51e8..88fad1f 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -2,10 +2,9 @@ find_package(Freetype REQUIRED) file (GLOB SMELTEXT_CPP_FILES "*.cpp") -include_directories( - ${FREETYPE_INCLUDE_DIRS} -) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) -add_library(smeltext STATIC ${SMELTEXT_CPP_FILES}) +include_directories(${PROJECT_SOURCE_DIR}/include/) +include_directories(${FREETYPE_INCLUDE_DIRS}) -target_link_libraries(smeltext smelt) +add_library(smeltext STATIC ${SMELTEXT_CPP_FILES}) diff --git a/smelt/glfw/CMakeLists.txt b/smelt/glfw/CMakeLists.txt index 73c2130..10a4120 100644 --- a/smelt/glfw/CMakeLists.txt +++ b/smelt/glfw/CMakeLists.txt @@ -16,6 +16,8 @@ set (SMELT_GLFW_CPP_FILES sys_glfw.cpp ) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + include_directories( ${GLEW_INCLUDE_DIRS} ) -- cgit v1.2.3