Cmake updates

CMakeLists.txt

@@ -96,12 +96,6 @@ add_compile_definitions(
         EMC2_VERSION="3.0.0"
         PACKAGE_VERSION="3.0.0"
         HAVE_READLINE
-        SEQUENTIAL_SUPPORT
-        HAL_SUPPORT
-        DYNAMIC_PLCSIZE
-        RT_SUPPORT
-        OLD_TIMERS_MONOS_SUPPORT
-        MODBUS_IO_MASTER
 )
 
 if(NOT ${BUILD_UDEV})

cmake/pythonBinary.cmake

@@ -0,0 +1,15 @@
+function(python_binary src)
+    get_filename_component(SRC_NAME ${src} NAME_WE)
+    set(SRC ${CMAKE_CURRENT_SOURCE_DIR}/${src})
+    set(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SRC_NAME})
+
+    add_custom_target(${SRC_NAME} DEPENDS ${OUTPUT})
+    add_custom_command(
+            OUTPUT ${OUTPUT}
+            COMMAND ${Python3_EXECUTABLE} -m py_compile ${SRC}
+            COMMENT "Syntax checking Python script ${src}"
+            COMMAND ${CMAKE_COMMAND} -E copy ${SRC} ${OUTPUT}
+            COMMAND chmod 755 ${OUTPUT}
+            DEPENDS ${SRC} ${Python3_EXECUTABLE}
+    )
+endfunction()

src/emc/tooldata/CMakeLists.txt

@@ -10,9 +10,11 @@ set_property(TARGET emc_tooldata PROPERTY POSITION_INDEPENDENT_CODE ON)
 if(${TOOL_NML})
     target_sources(emc_tooldata PRIVATE
             tooldata_nml.cc
-            )
+    )
 else()
-	#    message(FATAL_ERROR "unimplemented, please use nml.")
+    target_sources(emc_tooldata PRIVATE
+            tooldata_mmap.cc
+    )
 endif()
 
 add_executable(tooldata_watch tool_watch.cc)

src/hal/classicladder/CMakeLists.txt

@@ -1,5 +1,3 @@
-if(USE_GTK2)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CLASSICLADDER_SOURCES
@@ -9,11 +7,11 @@ set(CLASSICLADDER_SOURCES
         calc_sequential.c
         classicladder.c
         classicladder_gtk.c
-        config.c
         config_gtk.c
         drawing.c
         drawing_sequential.c
         edit.c
+        edit_copy.c
         edit_gtk.c
         edit_sequential.c
         editproperties_gtk.c
@@ -23,6 +21,8 @@ set(CLASSICLADDER_SOURCES
         files_sequential.c
         manager.c
         manager_gtk.c
+        menu_and_toolbar_gtk.c
+        print_gtk.c
         protocol_modbus_master.c
         protocol_modbus_slave.c
         serial_linux.c
@@ -31,18 +31,66 @@ set(CLASSICLADDER_SOURCES
         spy_vars_gtk.c
         symbols.c
         symbols_gtk.c
-        vars_names.c
         vars_access.c
-        )
+        vars_names.c
+)
+
+add_compile_definitions(
+        DYNAMIC_PLCSIZE
+        HAL_SUPPORT
+        MODBUS_IO_MASTER
+        OLD_TIMERS_MONOS_SUPPORT
+        RT_SUPPORT
+        SEQUENTIAL_SUPPORT
+)
 
 add_executable(classicladder ${CLASSICLADDER_SOURCES})
-target_include_directories(classicladder PRIVATE ${GTK2_INCLUDE_DIRS})
-target_include_directories(classicladder PRIVATE ${Intl_INCLUDE_DIRS})
-target_link_libraries(classicladder PRIVATE hal)
-target_link_libraries(classicladder PRIVATE Threads::Threads)
-target_link_libraries(classicladder PRIVATE ${GTK2_LIBRARIES})
-target_link_libraries(classicladder PRIVATE ${Intl_LIBRARIES})
-target_compile_definitions(classicladder PRIVATE GTK_INTERFACE GTK2)
+target_include_directories(classicladder
+        PRIVATE
+        ${GTK3_INCLUDE_DIRS}
+        ${Intl_INCLUDE_DIRS}
+)
+target_link_libraries(classicladder
+        PRIVATE
+        hal
+        Threads::Threads
+        ${GTK3_LIBRARIES}
+        ${Intl_LIBRARIES}
+)
+target_compile_definitions(classicladder
+        PRIVATE
+        GTK_INTERFACE
+)
+target_compile_options(classicladder
+        PRIVATE
+        -Wno-deprecated-declarations
+)
 get_uspace_config(classicladder)
 
-endif(USE_GTK2)
+set(CLASSICLADDER_RT_SOURCES
+        arithm_eval.c
+        arrays.c
+        calc.c
+        calc_sequential.c
+        manager.c
+        module_hal.c
+        symbols.c
+        vars_access.c
+)
+add_library(classicladder_rt SHARED ${CLASSICLADDER_RT_SOURCES})
+target_link_libraries(classicladder_rt
+        PRIVATE
+        hal
+        ulapi
+        Threads::Threads
+)
+set_target_properties(classicladder_rt
+        PROPERTIES
+        PREFIX ""
+        LIBRARY_OUTPUT_DIRECTORY ${RTLIB_DIR}
+)
+target_compile_definitions(classicladder_rt
+        PRIVATE
+        MODULE
+        RTAPI
+)

src/hal/components/CMakeLists.txt

@@ -25,18 +25,6 @@ build_component(NAME sampler SOURCES sampler.c LIBS ulapi hal)
 
 #todo: userkfuncs
 
-build_component(NAME classicladder_rt SOURCES
-		../classicladder/module_hal.c
-		../classicladder/arithm_eval.c
-		../classicladder/arrays.c
-		../classicladder/calc.c
-		../classicladder/calc_sequential.c
-		../classicladder/manager.c
-		../classicladder/symbols.c
-		../classicladder/vars_access.c
-		LIBS ulapi hal
-		)
-
 compile_component(abs_s32 abs_s32.comp ON)
 compile_component(abs abs.comp ON)
 compile_component(and2 and2.comp ON)

src/libnml/linklist/CMakeLists.txt

@@ -2,4 +2,5 @@ add_library(libnml_linklist
         linklist.cc
         )
 
-target_include_directories(libnml_linklist PUBLIC .)
+target_include_directories(libnml_linklist PUBLIC .)
+set_target_properties(libnml_linklist PROPERTIES POSITION_INDEPENDENT_CODE ON)