diff options
| -rw-r--r-- | ldmicro/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | ldmicro/applications/ldmicro.desktop (renamed from ldmicro/applications/LDMicro.desktop) | 8 | ||||
| -rw-r--r-- | ldmicro/reg/run-tests.pl | 2 |
3 files changed, 19 insertions, 17 deletions
diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt index b013b90..4ff4d56 100644 --- a/ldmicro/CMakeLists.txt +++ b/ldmicro/CMakeLists.txt @@ -5,7 +5,7 @@ project(LDMicro) #set version here. This version is updated to ldmicroVC.h set(LDMicro_VERSION_MAJOR 2) set(LDMicro_VERSION_MINOR 3) -set(LDMicro_VERSION_PATCH 0) +set(LDMicro_VERSION_PATCH 1) macro(use_cxx14) @@ -167,13 +167,13 @@ endif() target_link_libraries (ldinterpret LinuxUI) ## Build main LDMicro executable - add_executable (LDMicro ${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}) + add_executable (ldmicro ${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}) # Package Creation @@ -198,7 +198,7 @@ endif() DESTINATION share/applications COMPONENT resources ) - install( TARGETS LDMicro + install( TARGETS ldmicro DESTINATION bin ) ##Debian package creation @@ -207,8 +207,10 @@ endif() set(CPACK_PACKAGE_VERSION_MINOR ${LDMicro_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${LDMicro_VERSION_PATCH}) - set (CPACK_DEBIAN_FILE_NAME - "LDmicro_Qt-${LDMicro_VERSION_MAJOR}.${LDMicro_VERSION_MINOR}.${LDMicro_VERSION_PATCH}-${RELEASE_CODENAME}.deb") + string(CONCAT CPACK_PACKAGE_FILE_NAME + "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") @@ -220,7 +222,7 @@ endif() ## Add tests MESSAGE( STATUS "Adding tests.." ) add_custom_command( - TARGET LDMicro + TARGET ldmicro POST_BUILD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/reg COMMAND perl run-tests.pl) diff --git a/ldmicro/applications/LDMicro.desktop b/ldmicro/applications/ldmicro.desktop index 28c71d9..faf401e 100644 --- a/ldmicro/applications/LDMicro.desktop +++ b/ldmicro/applications/ldmicro.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Version=2.2 +Version=2.3 Terminal=false Icon=ldmicro Type=Application Categories=Education;Development;Electronics; -Exec=LDMicro +Exec=ldmicro MimeType=application/x-ldmicro-ld; -Name=LDMicro +Name=ldmicro GenericName=PLC Ladder CAD Comment=Ladder Logic editor, simulator and compiler for 8 bit microcontrollers -X-Desktop-File-Install-Version=2.2
\ No newline at end of file +X-Desktop-File-Install-Version=2.3 diff --git a/ldmicro/reg/run-tests.pl b/ldmicro/reg/run-tests.pl index 94d5ed0..e5a69c8 100644 --- a/ldmicro/reg/run-tests.pl +++ b/ldmicro/reg/run-tests.pl @@ -12,7 +12,7 @@ for $test (<tests/*.ld>) { unlink $output; - $cmd = "../build/LDMicro /c $test $output"; + $cmd = "../build/ldmicro /c $test $output"; system $cmd; $c++; } |