mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
update to cmake 2.8.12 (#451)
* update * resolve qt5w * test * Go down cmake python search won the price for crazy lib searches! * 2.7 python forced, RPATH * upstream * ... * update * ... * 2.7.12 py it picks random versions... * max 7.12.5.... * Test 14.04 tests
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
|
||||
find_package(PythonLibs REQUIRED)
|
||||
#OpenElec uses 2.7, if you want to compile for OpenElec require 2.7
|
||||
#find_package(PythonLibs 2.7 REQUIRED)
|
||||
find_package(PythonLibs 2.7 REQUIRED)
|
||||
message( STATUS "PYTHON VERSIONS FOUND: ${PYTHONLIBS_VERSION_STRING}" )
|
||||
|
||||
# Include the python directory. Also include the parent (which is for example /usr/include)
|
||||
# which may be required when it is not includes by the (cross-) compiler by default.
|
||||
@@ -11,14 +9,10 @@ include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}/..)
|
||||
SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/effectengine)
|
||||
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/effectengine)
|
||||
|
||||
# Group the headers that go through the MOC compiler
|
||||
SET(EffectEngineQT_HEADERS
|
||||
${CURRENT_HEADER_DIR}/EffectEngine.h
|
||||
${CURRENT_SOURCE_DIR}/Effect.h
|
||||
)
|
||||
|
||||
SET(EffectEngineHEADERS
|
||||
${CURRENT_HEADER_DIR}/EffectDefinition.h
|
||||
${CURRENT_HEADER_DIR}/EffectEngine.h
|
||||
${CURRENT_SOURCE_DIR}/Effect.h
|
||||
)
|
||||
|
||||
SET(EffectEngineSOURCES
|
||||
@@ -37,20 +31,16 @@ CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/EffectEngine.qrc.in ${CMAKE_BINARY_DIR}/Eff
|
||||
|
||||
SET(EffectEngine_RESOURCES ${CMAKE_BINARY_DIR}/EffectEngine.qrc)
|
||||
|
||||
QT5_WRAP_CPP(EffectEngineHEADERS_MOC ${EffectEngineQT_HEADERS})
|
||||
qt5_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} ) # OPTIONS "-no-compress"
|
||||
|
||||
add_library(effectengine
|
||||
${EffectEngineHEADERS}
|
||||
${EffectEngineQT_HEADERS}
|
||||
${EffectEngineHEADERS_MOC}
|
||||
${EffectEngine_RESOURCES_RCC}
|
||||
${EffectEngineSOURCES}
|
||||
)
|
||||
|
||||
qt5_use_modules(effectengine Core Gui)
|
||||
|
||||
target_link_libraries(effectengine
|
||||
hyperion
|
||||
${QT_LIBRARIES}
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
${PYTHON_LIBRARIES})
|
||||
|
@@ -1,5 +1,6 @@
|
||||
// Python includes
|
||||
#include <Python.h>
|
||||
#undef B0
|
||||
|
||||
// Stl includes
|
||||
#include <fstream>
|
||||
|
Reference in New Issue
Block a user