Merge branch 'master' of http://192.168.1.47/nicolas/Almond

CMakeLists.txt

@@ -10,8 +10,7 @@ set(CMAKE_AUTOUIC ON)
 
 find_package(Qt5 COMPONENTS Core Widgets OpenGL Xml REQUIRED)
 find_package(OpenMP)
-find_package(OpenGL)
-#set(Boost_DEBUG 1)
+find_package(OpenGL REQUIRED COMPONENTS OpenGL)
 set(Boost_USE_STATIC_LIBS ON)
 find_package(Boost 1.65 REQUIRED)
 
@@ -38,7 +37,7 @@ target_include_directories(Almond PUBLIC ${FFMPEG_INCLUDE_DIRS})
 target_link_libraries(Almond PUBLIC mandel asmjit qd)
 target_link_libraries(Almond PUBLIC Qt5::Core Qt5::Widgets Qt5::OpenGL Qt5::Xml)
 target_link_libraries(Almond PUBLIC ${FFMPEG_LIBRARIES})
-target_link_libraries(Almond PUBLIC ${OPENGL_LIBRARIES})
+target_link_libraries(Almond PUBLIC OpenGL::OpenGL)
 
 if(Boost_FOUND)
     target_compile_definitions(Almond PUBLIC WITH_BOOST)
@@ -50,3 +49,16 @@ endif(Boost_FOUND)
 if(OpenMP_CXX_FOUND)
     target_link_libraries(mandel PUBLIC OpenMP::OpenMP_CXX)
 endif()
+
+install(TARGETS Almond RUNTIME DESTINATION "bin")
+set(CPACK_GENERATOR "DEB")
+set(CPACK_SOURCE_GENERATOR "DEB")
+set(CPACK_COMPONENTS_ALL Almond)
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Nicolas Winkler")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt5-default,libavformat58,libavdevice58,libavfilter7,libavutil56,libswscale5,libgl1,ocl-icd-libopencl1")
+set(CPACK_SET_DESTDIR True)
+set(CPACK_INSTALL_PREFIX "/usr")
+
+include(CPack)
+
+

libmandel/CMakeLists.txt

@@ -10,6 +10,7 @@ find_package(OpenCL REQUIRED)
 find_package(OpenMP)
 #set(Boost_DEBUG 1)
 set(Boost_USE_STATIC_LIBS ON)
+set(ASMJIT_STATIC ON)
 find_package(Boost 1.65 REQUIRED)
 
 
@@ -40,6 +41,7 @@ elseif(ARCH STREQUAL "ARM")
 endif()
 
 #    message(${MandelSources})
+add_subdirectory(asmjit)
 
 add_library(mandel STATIC ${MandelSources})
 
@@ -49,12 +51,12 @@ target_compile_definitions(mandel PUBLIC WITH_QD)
 add_library(qd STATIC ${QdSources})
 target_include_directories(qd PUBLIC qd-2.3.22/include qd-2.3.22)
 
-FILE(GLOB AsmjitSources asmjit/src/asmjit/*/*.cpp)
-add_library(asmjit STATIC ${AsmjitSources})
+#FILE(GLOB AsmjitSources asmjit/src/asmjit/*/*.cpp)
+#add_library(asmjit STATIC ${AsmjitSources})
 
-target_include_directories(asmjit PUBLIC asmjit/src)
-target_compile_definitions(asmjit PUBLIC NOMINMAX)
-target_compile_definitions(asmjit PUBLIC ASMJIT_STATIC)
+#target_include_directories(asmjit PUBLIC asmjit/src)
+#target_compile_definitions(asmjit PUBLIC NOMINMAX)
+#target_compile_definitions(asmjit PUBLIC ASMJIT_STATIC)
 
 #target_include_directories(mandel PUBLI#C qd-2.3.22/include)
 #target_include_directories(mandel PUBLI#C qd-2.3.22/include)