Fixed CMakeLists.txt.

This commit is contained in:
nissim.hadar 2017-11-26 01:12:55 -08:00
parent c0d1549ca5
commit 1510c4d68a

View file

@ -6,17 +6,19 @@ SET(CMAKE_AUTOUIC ON)
SET(CMAKE_AUTOMOC ON) SET(CMAKE_AUTOMOC ON)
setup_hifi_project(Core Widgets) setup_hifi_project(Core Widgets)
link_hifi_libraries()
# FIX: Qt was built with -reduce-relocations ## FIX: Qt was built with -reduce-relocations
if (Qt5_POSITION_INDEPENDENT_CODE) #if (Qt5_POSITION_INDEPENDENT_CODE)
SET(CMAKE_POSITION_INDEPENDENT_CODE ON) # SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif() #endif()
# Qt includes # Qt includes
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${Qt5Core_INCLUDE_DIRS}) include_directories(${Qt5Core_INCLUDE_DIRS})
include_directories(${Qt5Widgets_INCLUDE_DIRS}) include_directories(${Qt5Widgets_INCLUDE_DIRS})
set(QT_LIBRARIES Qt5::Core Qt5::Widgets)
# Find all sources files # Find all sources files
file (GLOB_RECURSE SOURCES src/*.cpp) file (GLOB_RECURSE SOURCES src/*.cpp)
file (GLOB_RECURSE HEADERS src/*.h) file (GLOB_RECURSE HEADERS src/*.h)
@ -29,7 +31,6 @@ endif()
add_executable(PROJECT_NAME ${SOURCES} ${HEADERS} ${UIS}) add_executable(PROJECT_NAME ${SOURCES} ${HEADERS} ${UIS})
set(QT_LIBRARIES Qt5::Core Qt5::Widgets)
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES})
# Copy required dll's. # Copy required dll's.