From f25df59f87478327d6c136cee80a83da66371c3d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 25 Aug 2021 11:15:37 +0200 Subject: [PATCH] [CMake] remove tabs --- CMakeLists.txt | 26 ++++----- QGVCore/CMakeLists.txt | 120 ++++++++++++++++++++--------------------- Sample/CMakeLists.txt | 24 ++++----- 3 files changed, 85 insertions(+), 85 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0214bb0..7d14433 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,18 +70,18 @@ ENDIF(BINDINGS_QT5) SET(CMAKE_AUTOMOC ON) IF(NOT KDE) - IF(NOT APPLE) - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") - ENDIF(NOT APPLE) - IF(MSVC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_EXCEPTIONS -Zc:wchar_t-") - ELSE(MSVC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") - ENDIF(MSVC) - IF(NOT WIN32 AND NOT APPLE) -# SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings -lc -Wl,--disable-auto-import") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings -lc") - ENDIF(NOT WIN32 AND NOT APPLE) + IF(NOT APPLE) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") + ENDIF(NOT APPLE) + IF(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_EXCEPTIONS -Zc:wchar_t-") + ELSE(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") + ENDIF(MSVC) + IF(NOT WIN32 AND NOT APPLE) + #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings -lc -Wl,--disable-auto-import") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings -lc") + ENDIF(NOT WIN32 AND NOT APPLE) ENDIF(NOT KDE) ADD_DEFINITIONS(${QT_DEFINITIONS}) @@ -99,7 +99,7 @@ SET(${PROJECT_NAME}_HEADERS QGVCore/QGVNode.h QGVCore/QGVScene.h QGVCore/QGVSubGraph.h -) + ) ADD_SUBDIRECTORY(QGVCore) ADD_SUBDIRECTORY(Sample EXCLUDE_FROM_ALL) diff --git a/QGVCore/CMakeLists.txt b/QGVCore/CMakeLists.txt index e470892..6081b13 100644 --- a/QGVCore/CMakeLists.txt +++ b/QGVCore/CMakeLists.txt @@ -2,14 +2,14 @@ # see http://cmake.org/cmake/help/cmake2.6docs.html#module:FindQt4 for a complete list SET(qgvlib_TS -) + ) SET(qgvlib_UI -) + ) # all files which may be mocced SET(qgvlib_CPP - private/QGVCore.cpp + private/QGVCore.cpp private/QGVGraphPrivate.cpp private/QGVEdgePrivate.cpp private/QGVGvcPrivate.cpp @@ -18,48 +18,48 @@ SET(qgvlib_CPP QGVNode.cpp QGVScene.cpp QGVSubGraph.cpp -) + ) SET(TARGET_NAME "QGVCore") INCLUDE_DIRECTORIES( - ${Graphviz_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} + ${Graphviz_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/private ${CMAKE_CURRENT_BINARY_DIR}/private -) + ) # Activate Export macro for building the library itself # if QGVCORE_LIB is not set or equal 0 (null), import macro is used ADD_DEFINITIONS(-DQGVCORE_LIB) IF(BINDINGS_QT4) - # QT5 does not declare and does not need QT_INCLUDES - SET(INCLUDE_DIRECTORIES ${INCLUDES_DIRECTORIES} ${QT_INCLUDES}) - # include with QT_USE selected library parts - INCLUDE(${QT_USE_FILE}) + # QT5 does not declare and does not need QT_INCLUDES + SET(INCLUDE_DIRECTORIES ${INCLUDES_DIRECTORIES} ${QT_INCLUDES}) + # include with QT_USE selected library parts + INCLUDE(${QT_USE_FILE}) ENDIF(BINDINGS_QT4) ADD_DEFINITIONS(-DQVGCORE_LIB) IF(BINDINGS_QT4) - QT4_AUTOMOC(${qgvlib_CPP}) - QT4_WRAP_UI(qgvlib_UI_H ${qgvlib_UI}) - QT4_ADD_TRANSLATION(qgvlib_TRANS ${qgvlib_TS}) - # -binary is not working - # QT4_ADD_RESOURCES(RCCS "${QRCS}" OPTIONS "-binary") - # QT4_ADD_RESOURCES(qgvlib_RCCS ${qgvlib_QRC}) + QT4_AUTOMOC(${qgvlib_CPP}) + QT4_WRAP_UI(qgvlib_UI_H ${qgvlib_UI}) + QT4_ADD_TRANSLATION(qgvlib_TRANS ${qgvlib_TS}) + # -binary is not working + # QT4_ADD_RESOURCES(RCCS "${QRCS}" OPTIONS "-binary") + # QT4_ADD_RESOURCES(qgvlib_RCCS ${qgvlib_QRC}) ENDIF(BINDINGS_QT4) IF(BINDINGS_QT5) - QT5_WRAP_UI(qgvlib_UI_H ${qgvlib_UI}) - QT5_ADD_TRANSLATION(qgvlib_TRANS ${qgvlib_TS}) - QT5_ADD_RESOURCES(qgvlib_RCCS ${qgvlib_QRC}) + QT5_WRAP_UI(qgvlib_UI_H ${qgvlib_UI}) + QT5_ADD_TRANSLATION(qgvlib_TRANS ${qgvlib_TS}) + QT5_ADD_RESOURCES(qgvlib_RCCS ${qgvlib_QRC}) ENDIF(BINDINGS_QT5) ADD_LIBRARY(qgvcore SHARED ${qgvlib_CPP} ${qgvlib_UI_H} ${qgvlib_TRANS} -) + ) TARGET_LINK_LIBRARIES(qgvcore PUBLIC ${Graphviz_LIBRARIES}) @@ -73,50 +73,50 @@ IF(BINDINGS_QT5) ENDIF(BINDINGS_QT5) IF(WIN32) - # this extra install command is needed by the nsis installer - INSTALL(TARGETS qgvcore - RUNTIME DESTINATION lib - COMPONENT library - ) + # this extra install command is needed by the nsis installer + INSTALL(TARGETS qgvcore + RUNTIME DESTINATION lib + COMPONENT library + ) ELSE(WIN32) - INSTALL(TARGETS qgvcore - EXPORT ${TARGETS_EXPORT_NAME} - DESTINATION lib - COMPONENT library - ) + INSTALL(TARGETS qgvcore + EXPORT ${TARGETS_EXPORT_NAME} + DESTINATION lib + COMPONENT library + ) ENDIF(WIN32) # The COMPONENT option only defines the internal belonging of the INSTALL'ed thing # INSTALL( - # FILES ${qgvlib_TRANS} - # DESTINATION ${qm_DIR} - # COMPONENT library +# FILES ${qgvlib_TRANS} +# DESTINATION ${qm_DIR} +# COMPONENT library # ) IF(WIN32) - # QuaZip - # FIND_FILE(PACK_zlib zlib.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) - # INSTALL(FILES ${QUAZIP_LIBRARIES} ${PACK_zlib} DESTINATION ${bin_DIR} COMPONENT library) - - # Qt itself - FIND_FILE(PACK_qtcore QtCore4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) - FIND_FILE(PACK_qtgui QtGui4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) - - FIND_FILE(PACK_mingwm10 mingwm10.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) - FIND_FILE(PACK_libgcc_s_dw libgcc_s_dw2-1.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) - - INSTALL( - FILES - ${PACK_qtcore} - ${PACK_qtgui} - # ${PACK_qtnetwork} - # ${PACK_qtsql} - # ${PACK_libmysql} - # ${PACK_qtxml} - # ${PACK_qtxml_patterns} - ${PACK_mingwm10} - ${PACK_libgcc_s_dw} - DESTINATION ${bin_DIR} - COMPONENT qtlibs - ) + # QuaZip + # FIND_FILE(PACK_zlib zlib.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # INSTALL(FILES ${QUAZIP_LIBRARIES} ${PACK_zlib} DESTINATION ${bin_DIR} COMPONENT library) + + # Qt itself + FIND_FILE(PACK_qtcore QtCore4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + FIND_FILE(PACK_qtgui QtGui4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + + FIND_FILE(PACK_mingwm10 mingwm10.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + FIND_FILE(PACK_libgcc_s_dw libgcc_s_dw2-1.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + + INSTALL( + FILES + ${PACK_qtcore} + ${PACK_qtgui} + # ${PACK_qtnetwork} + # ${PACK_qtsql} + # ${PACK_libmysql} + # ${PACK_qtxml} + # ${PACK_qtxml_patterns} + ${PACK_mingwm10} + ${PACK_libgcc_s_dw} + DESTINATION ${bin_DIR} + COMPONENT qtlibs + ) ENDIF(WIN32) diff --git a/Sample/CMakeLists.txt b/Sample/CMakeLists.txt index 42913e5..ed03f09 100644 --- a/Sample/CMakeLists.txt +++ b/Sample/CMakeLists.txt @@ -2,18 +2,18 @@ # see http://cmake.org/cmake/help/cmake2.6docs.html#module:FindQt4 for a complete list SET(qgv_TS -) + ) SET(qgv_UI MainWindow.ui -) + ) # all files which may be mocced SET(qgv_CPP - main.cpp + main.cpp MainWindow.cpp QGraphicsViewEc.cpp -) + ) IF(BINDINGS_QT4) # include with QT_USE selected library parts @@ -23,9 +23,9 @@ ENDIF(BINDINGS_QT4) INCLUDE_DIRECTORIES( ${libqgv_SOURCE_DIR} ${libqgv_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ) IF(BINDINGS_QT4) # make *.h out of *.ui @@ -48,19 +48,19 @@ SET(neededStuff ${qgv_CPP} ${qgv_UI_H} ${qgv_TRANS} -) + ) IF(UNIX) - ADD_EXECUTABLE(sample ${neededStuff}) + ADD_EXECUTABLE(sample ${neededStuff}) ELSEIF(APPLE) - # it's with gui, so MACOSX_BUNDLE is needed - ADD_EXECUTABLE(sample MACOSX_BUNDLE ${neededStuff}) + # it's with gui, so MACOSX_BUNDLE is needed + ADD_EXECUTABLE(sample MACOSX_BUNDLE ${neededStuff}) ELSEIF(WIN32) # it's with gui, so WIN32 is needed ADD_EXECUTABLE(sample WIN32 ${neededStuff}) ENDIF() SET_TARGET_PROPERTIES(sample PROPERTIES - OUTPUT_NAME "Sample") + OUTPUT_NAME "Sample") TARGET_LINK_LIBRARIES(sample qgvcore) IF(BINDINGS_QT4)