@@ -96,13 +96,15 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
9696endif (EXISTS ${CMAKE_SOURCE_DIR} /.git )
9797set_source_files_properties (src/AboutDialog.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR} /src/gen_version.h )
9898
99- #icon for windows
99+ #icon and correct libs/subsystem for windows
100100if (WIN32 )
101101 IF ( MINGW )
102102 # resource compilation for MinGW
103103 ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR} /sqlbicon.o
104- COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/src/winapp.rc -o ${CMAKE_CURRENT_BINARY_DIR} /sqlbicon.o )
104+ COMMAND windres -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/src/winapp.rc -o ${CMAKE_CURRENT_BINARY_DIR} /sqlbicon.o )
105105 set (SQLB_SRC ${SQLB_SRC} ${CMAKE_CURRENT_BINARY_DIR} /sqlbicon.o)
106+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows" )
107+ set (ADDITIONAL_LIBS lcms lzma)
106108 ELSE ( MINGW )
107109 set (SQLB_SRC ${SQLB_SRC} ${CMAKE_CURRENT_SOURCE_DIR} src/winapp.rc)
108110 ENDIF ( MINGW )
@@ -116,23 +118,12 @@ add_dependencies(${PROJECT_NAME} antlr qhexedit)
116118
117119link_directories (${CMAKE_CURRENT_BINARY_DIR} /${ANTLR_DIR} ${CMAKE_CURRENT_BINARY_DIR} /${QHEXEDIT_DIR} )
118120
119- target_link_libraries (${PROJECT_NAME} antlr qhexedit ${QT_LIBRARIES} sqlite3 )
121+ target_link_libraries (${PROJECT_NAME} antlr qhexedit ${QT_LIBRARIES} sqlite3 ${ADDITIONAL_LIBS} )
120122
121123install (TARGETS ${PROJECT_NAME}
122124 RUNTIME DESTINATION bin
123125 LIBRARY DESTINATION lib)
124126
125- if (WIN32 )
126- install (FILES
127- ${CMAKE_CURRENT_SOURCE_DIR} /dlls/libgcc_s_dw2-1.dll
128- ${CMAKE_CURRENT_SOURCE_DIR} /dlls/libsqlite3-0.dll
129- ${CMAKE_CURRENT_SOURCE_DIR} /dlls/libstdc++-6.dll
130- ${CMAKE_CURRENT_SOURCE_DIR} /dlls/mingwm10.dll
131- ${CMAKE_CURRENT_SOURCE_DIR} /dlls/QtCore4.dll
132- ${CMAKE_CURRENT_SOURCE_DIR} /dlls/QtGui4.dll
133- DESTINATION bin)
134- endif (WIN32 )
135-
136127#cpack
137128set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sqlite database browser UI" )
138129set (CPACK_PACKAGE_VENDOR "oldsch00l" )
0 commit comments