Skip to content

Update to Qt5.15 and Qt6 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kassane wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Qt5.15 and Qt6 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
/ldmicro/includes/ldlogo.h
LDMicro-linux-Workspace.code-workspace
ldmicro/reg/t.pl
/build/
.cache/
255 changes: 140 additions & 115 deletions ldmicro/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,53 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.14)

project(LDMicro)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose default type of build (Debug)" FORCE)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
elseif(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
set(CMAKE_CONFIGURATION_TYPES "Release")
else()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
endif()

#set version here. This version is updated to ldmicroVC.h
set(LDMicro_VERSION_MAJOR 2)
set(LDMicro_VERSION_MINOR 3)
set(LDMicro_VERSION_PATCH 2)

macro(use_cxx14)

if (CMAKE_VERSION VERSION_LESS "3.1")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
endif ()
else ()
set (CMAKE_CXX_STANDARD 14)
endif ()
if(CMAKE_VERSION VERSION_LESS "3.1")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
endif()
else()
set(CMAKE_CXX_STANDARD 14)
endif()

endmacro(use_cxx14)

IF(WIN32)
MESSAGE( FATAL_ERROR "Cannot build for windows, exiting" )
MESSAGE(FATAL_ERROR "Cannot build for windows, exiting")
add_definitions(-D__WIN32__)
ENDIF(WIN32)

IF (MSVC)
MESSAGE( FATAL_ERROR "Cannot build for MacOS, exiting" )
IF(MSVC)
MESSAGE(FATAL_ERROR "Cannot build for MacOS, exiting")
add_definitions(-D__MSVC__)
ENDIF (MSVC)
ENDIF(MSVC)

IF(UNIX)
MESSAGE( STATUS "Initializing.." )
add_definitions ("-w")
add_definitions ("-g")
MESSAGE(STATUS "Initializing..")
add_definitions("-w")
add_definitions("-g")
add_definitions(-D__UNIX__)
add_definitions(-DLDLANG_EN)

execute_process(COMMAND lsb_release -cs
OUTPUT_VARIABLE RELEASE_CODENAME
OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_VARIABLE RELEASE_CODENAME
OUTPUT_STRIP_TRAILING_WHITESPACE)
STRING(TOLOWER ${RELEASE_CODENAME} RELEASE_LOWER)
message("-- os_version_suffix:${RELEASE_CODENAME}")
if(${RELEASE_LOWER} MATCHES "trusty")
Expand All @@ -49,40 +58,40 @@ IF(UNIX)
add_definitions(-D__UBUNTU_16_)
endif()
use_cxx14()

# set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/build/")

MESSAGE( STATUS "Performing system check.." )
MESSAGE( STATUS "Identifing bitness of the platform.." )
MESSAGE(STATUS "Performing system check..")
MESSAGE(STATUS "Identifing bitness of the platform..")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
add_definitions(-D__UNIX64)
MESSAGE( STATUS "Bitness of the platform: " 64)
MESSAGE(STATUS "Bitness of the platform: " 64)
else()
add_definitions(-D__UNIX32)
MESSAGE( STATUS "Bitness of the platform: " 36)
MESSAGE(STATUS "Bitness of the platform: " 36)
endif()
MESSAGE( STATUS "Performing system check - done" )
MESSAGE(STATUS "Performing system check - done")

## Set object dir
set(OBJDIR ${CMAKE_CURRENT_SOURCE_DIR}/obj)

## Set perl scripts to be run before build to generate files needed
MESSAGE( STATUS "Adding perl scripts to build.." )
MESSAGE(STATUS "Adding perl scripts to build..")

add_custom_command(
add_custom_command(
OUTPUT ${OBJDIR}/lang-tables.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND perl lang-tables.pl > ${OBJDIR}/lang-tables.h
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/lang-*.txt")
add_custom_command(

add_custom_command(
OUTPUT ${OBJDIR}/helptext.cpp
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND perl txt2c.pl > ${OBJDIR}/helptext.cpp
COMMAND perl txt2c.pl > ${OBJDIR}/helptext.cpp
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/manual*.txt")

set(SCRIPT_GENERATED_FILES ${OBJDIR}/helptext.cpp
${OBJDIR}/lang-tables.h)
${OBJDIR}/lang-tables.h)

add_custom_target(LDMicro_SCRIPT_GENERATED_FILES DEPENDS ${SCRIPT_GENERATED_FILES})

Expand All @@ -93,113 +102,128 @@ IF(UNIX)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/includes")
# include_directories("${OBJDIR}")
set(PROJECT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/includes")
CONFIGURE_FILE (
CONFIGURE_FILE(
"${PROJECT_INCLUDE_DIR}/ldmicroVC.h.in"
"${PROJECT_INCLUDE_DIR}/ldmicroVC.h"
)
# MESSAGE ( STATUS " PROJECT_INCLUDE_DIR: " ${PROJECT_INCLUDE_DIR} )
MESSAGE ( STATUS " PROJECT_INCLUDE_DIR: " ${PROJECT_INCLUDE_DIR} )

set_property(SOURCE ${OBJDIR}/helptext.cpp PROPERTY SKIP_AUTOGEN ON)

set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt5Widgets CONFIG REQUIRED)
find_package(Qt5Core CONFIG REQUIRED)
find_package(Qt5Gui CONFIG REQUIRED)
get_target_property(Qt5Widgets_INCLUDES Qt5::Widgets INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(Qt5Core_INCLUDES Qt5::Core INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(Qt5Gui_INCLUDES Qt5::Gui INTERFACE_INCLUDE_DIRECTORIES)
include_directories(${Qt5Widgets_INCLUDES})
include_directories(${Qt5Core_INCLUDES})
include_directories(${Qt5Gui_INCLUDES})
add_definitions(${Qt5Widgets_DEFINITIONS})
add_definitions(${Qt5Core_DEFINITIONS})
include_directories(${Qt5Gui_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
#get_target_property(CMAKE_CXX_FLAGS Qt5::Core LINK_FLAGS)
MESSAGE ( STATUS " Qt INCLUDEs: " ${Qt5Core_INCLUDES} )

MESSAGE ( STATUS " Qt CXX FLAGS: " ${CMAKE_CXX_FLAGS} )

if (Qt5_POSITION_INDEPENDENT_CODE)
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
include(FeatureSummary)
find_package(
QT NAMES Qt6 Qt5
COMPONENTS Core Gui Widgets
REQUIRED
)

find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
get_target_property(Qt${QT_VERSION_MAJOR}Widgets_INCLUDES Qt${QT_VERSION_MAJOR}::Widgets INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(Qt${QT_VERSION_MAJOR}Core_INCLUDES Qt${QT_VERSION_MAJOR}::Core INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(Qt${QT_VERSION_MAJOR}Gui_INCLUDES Qt${QT_VERSION_MAJOR}::Gui INTERFACE_INCLUDE_DIRECTORIES)
if(Qt${QT_VERSION} EQUAL 6)
include_directories(${Qt6Widgets_INCLUDES})
include_directories(${Qt6Core_INCLUDES})
include_directories(${Qt6Gui_INCLUDES})
add_definitions(${Qt6Widgets_DEFINITIONS})
add_definitions(${Qt6Core_DEFINITIONS})
add_definitions(${Qt6Gui_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${Qt6Widgets_EXECUTABLE_COMPILE_FLAGS}")
else()
include_directories(${Qt5Widgets_INCLUDES})
include_directories(${Qt5Core_INCLUDES})
include_directories(${Qt5Gui_INCLUDES})
add_definitions(${Qt5Widgets_DEFINITIONS})
add_definitions(${Qt5Core_DEFINITIONS})
include_directories(${Qt5Gui_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
endif()
# get_target_property(CMAKE_CXX_FLAGS Qt${QT_VERSION_MAJOR} LINK_FLAGS)
# MESSAGE(STATUS " Qt INCLUDEs: " ${Qt5Core_INCLUDES})

# MESSAGE(STATUS " Qt CXX FLAGS: " ${CMAKE_CXX_FLAGS})

set(CMAKE_POSITION_INDEPENDENT_CODE ON)

add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/linuxUI")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/freezeLD")

## Dummy compile and install to test linuxUI
## to compile LDmicro uncomment the below 2 line2
set (COMPILE_CPP_SOURCES arduino.cpp
avr.cpp
pic16.cpp
interpreted.cpp
ansic.cpp
compilecommon.cpp
intcode.cpp
lang.cpp
miscutil.cpp
iolist.cpp
confdialog.cpp
lutdialog.cpp
resetdialog.cpp
simpledialog.cpp
coildialog.cpp
contactsdialog.cpp
commentdialog.cpp
simulate.cpp
loadsave.cpp
undoredo.cpp
circuit.cpp
draw_outputdev.cpp
draw.cpp
schematic.cpp
helpdialog.cpp
toolbar.cpp
${OBJDIR}/helptext.cpp
maincontrols.cpp
ldmicro.cpp)

set(COMPILE_CPP_SOURCES arduino.cpp
# lib/linuxUI/linuxUI.cpp lib/linuxUI/linuxUI.h lib/linuxUI/linuxLD.cpp lib/linuxUI/linuxLD.h
avr.cpp
pic16.cpp
interpreted.cpp
ansic.cpp
compilecommon.cpp
intcode.cpp
lang.cpp
miscutil.cpp
iolist.cpp
confdialog.cpp
lutdialog.cpp
resetdialog.cpp
simpledialog.cpp
coildialog.cpp
contactsdialog.cpp
commentdialog.cpp
simulate.cpp
loadsave.cpp
undoredo.cpp
circuit.cpp
draw_outputdev.cpp
draw.cpp
schematic.cpp
helpdialog.cpp
toolbar.cpp
${OBJDIR}/helptext.cpp
maincontrols.cpp
ldmicro.cpp)

## Build *.int interpreter
add_executable (ldinterpret ldinterpret.c)
target_link_libraries (ldinterpret LinuxUI)
add_executable(ldinterpret ldinterpret.c)
target_link_libraries(ldinterpret LinuxUI)

## Build main LDMicro executable
add_executable (ldmicro ${COMPILE_CPP_SOURCES} ldmicro.qrc)
add_executable(ldmicro)
target_sources(ldmicro PUBLIC ${COMPILE_CPP_SOURCES} ldmicro.qrc)
add_dependencies(ldmicro LDMicro_SCRIPT_GENERATED_FILES)
target_link_libraries (ldmicro LinuxUI)
target_link_libraries (ldmicro FreezeLD)
target_link_libraries(ldmicro ${Qt5Widgets_LIBRARIES})
target_link_libraries(ldmicro ${Qt5Core_LIBRARIES})
target_link_libraries(ldmicro ${Qt5Gui_LIBRARIES})
target_link_libraries(ldmicro PUBLIC
LinuxUI
FreezeLD
PRIVATE
Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets)

# Package Creation

if( NOT DEFAULT_INSTALL_PATH )
set( DEFAULT_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}"
CACHE
PATH
"Location of LDMicro data files." )
if(NOT DEFAULT_INSTALL_PATH)
set(DEFAULT_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}"
CACHE
PATH
"Location of LDMicro data files.")
endif()

# Set paths
set( UNIX_ICON_FILES icons/ )
set( UNIX_APPLICATIONS_FILES applications/ )
set( LDMICRO_BIN bin CACHE PATH "LDmicro binaries.")
set(UNIX_ICON_FILES icons/)
set(UNIX_APPLICATIONS_FILES applications/)
set(LDMICRO_BIN bin CACHE PATH "LDmicro binaries.")

install( DIRECTORY ${UNIX_ICON_FILES}
install(DIRECTORY ${UNIX_ICON_FILES}
DESTINATION share/icons
COMPONENT resources
)
)

install( DIRECTORY ${UNIX_APPLICATIONS_FILES}
install(DIRECTORY ${UNIX_APPLICATIONS_FILES}
DESTINATION share/applications
COMPONENT resources
)
install( TARGETS ldmicro
DESTINATION bin
)
install(TARGETS ldmicro
DESTINATION bin
)
##Debian package creation
set(CPACK_GENERATOR "DEB")
Expand All @@ -211,20 +235,21 @@ endif()
"LDmicro_Qt-${CPACK_PACKAGE_VERSION_MAJOR}."
"${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}"
"-Linux-${RELEASE_CODENAME}")

set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_PACKAGE_DESCRIPTION "Ladder Logic editor, simulator and compiler for 8 bit microcontrollers")
set(CPACK_PACKAGE_CONTACT "Akshay Chipkar akshaychipkar@yahoo.co.in")
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/Debian/postinst")

include(CPack)

## Add tests
MESSAGE( STATUS "Adding tests.." )
add_custom_command(
TARGET ldmicro
POST_BUILD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/reg
COMMAND perl run-tests.pl)
# MESSAGE( STATUS "Adding tests.." )
# add_custom_command(
# TARGET ldmicro
# POST_BUILD
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/reg
# COMMAND perl run-tests.pl)

ENDIF(UNIX)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
2 changes: 1 addition & 1 deletion ldmicro/coildialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void ShowCoilDialog(BOOL *negated, BOOL *setOnly, BOOL *resetOnly, char *name)
// CoilDialog->setFixedSize(359,115);
MakeControls();
NameTextbox->setValidator(
new QRegExpValidator(QRegExp("[a-zA-Z0-9_]+")));
new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[a-zA-Z0-9_]+"))));

if(name[0] == 'R') {
SourceInternalRelayRadio->setChecked(TRUE);
Expand Down
Loading