f827f03fb1
- Narrow down `dos2unix' fixup to one needed file only - Fix symlink which was pointing to an absolute path - Drop INSTALLS_ICONS knob (not applicable to Qt ports)
77 lines
2.4 KiB
Text
77 lines
2.4 KiB
Text
--- CMakeLists.txt.orig 2015-01-27 14:22:56 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -24,12 +24,14 @@ if(WIN32)
|
|
endif(MINGW)
|
|
endif(WIN32)
|
|
|
|
-find_package(Qt4 4.4.2 COMPONENTS QtCore QtGui REQUIRED)
|
|
-include(${QT_USE_FILE})
|
|
|
|
-add_definitions (${QT_DEFINITIONS})
|
|
-include_directories (${QT_INCLUDES} ${CMAKE_BINARY_DIR})
|
|
+# Find the Qt5 libraries
|
|
+find_package(Qt5Core REQUIRED)
|
|
+find_package(Qt5Gui REQUIRED)
|
|
+find_package(Qt5Widgets REQUIRED)
|
|
|
|
+include_directories(${CMAKE_BINARY_DIR})
|
|
+
|
|
set(EDSDK_LDFLAGS "")
|
|
if(WIN32)
|
|
set(EDSDKPATH "${CMAKE_SOURCE_DIR}/EDSDK")
|
|
@@ -50,6 +52,13 @@ elseif(UNIX)
|
|
add_definitions(-DGPHOTO2=1)
|
|
endif(WIN32)
|
|
|
|
+# Find includes in corresponding current build & source directories
|
|
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
+
|
|
+# Instruct CMake to run moc automatically when needed.
|
|
+set(CMAKE_AUTOMOC ON)
|
|
+set(CMAKE_AUTOUIC ON)
|
|
+
|
|
set(eos_movrec_SRCS
|
|
main.cpp
|
|
mainwnd.cpp
|
|
@@ -73,12 +82,6 @@ if(WIN32)
|
|
set_property(SOURCE eos_movrec.rc PROPERTY OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/CMakeLists.txt)
|
|
endif(WIN32)
|
|
|
|
-# headers with Q_OBJECT
|
|
-set(eos_movrec_MOC_HEADERS
|
|
- mainwnd.h
|
|
- blinklabel.h
|
|
-)
|
|
-
|
|
# force use exceptions
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
|
|
# add debug defines
|
|
@@ -86,12 +89,13 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}
|
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
|
|
|
|
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1)
|
|
-QT4_WRAP_CPP(MOC_SRCS ${eos_movrec_MOC_HEADERS})
|
|
|
|
if (WIN32)
|
|
set(CMAKE_RC_COMPILER windres)
|
|
# set rc syntax
|
|
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>")
|
|
+ set(CMAKE_RC_SOURCE_FILE_EXTENSIONS rc)
|
|
+ set(CMAKE_RC_FLAGS "-I${CMAKE_BINARY_DIR}")
|
|
|
|
# enable resource language
|
|
enable_language(RC)
|
|
@@ -102,10 +106,10 @@ if (WIN32)
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")
|
|
endif(WIN32)
|
|
|
|
-add_executable(eos_movrec ${eos_movrec_SRCS} ${MOC_SRCS})
|
|
+add_executable(eos_movrec WIN32 ${eos_movrec_SRCS})
|
|
if (WIN32)
|
|
- TARGET_LINK_LIBRARIES(eos_movrec ${QT_LIBRARIES} ${EDSDK_LDFLAGS})
|
|
+ TARGET_LINK_LIBRARIES(eos_movrec Qt5::Core Qt5::Gui Qt5::Widgets ${EDSDK_LDFLAGS})
|
|
elseif(UNIX)
|
|
- TARGET_LINK_LIBRARIES(eos_movrec ${QT_LIBRARIES} ${LIBGPHOTO2_LDFLAGS})
|
|
+ TARGET_LINK_LIBRARIES(eos_movrec Qt5::Core Qt5::Gui Qt5::Widgets ${LIBGPHOTO2_LDFLAGS})
|
|
endif(WIN32)
|
|
install(TARGETS eos_movrec RUNTIME DESTINATION bin)
|