Update cmake script

Signed-off-by: Firas Sahli <firas.sahli@adlinktech.com>

Author: FirasSahliADLinktech

bit/CMakeLists.txt

@@ -1,8 +1,44 @@
 cmake_minimum_required(VERSION 3.7)
+project(dds-python)
 
 find_package(CycloneDDS)
 
-idlc_generate(ddsbit bit.idl)
-add_library(ddstubs SHARED dds_stubs.c)
-target_link_libraries(ddstubs ddsbit CycloneDDS::ddsc)
+#idlc_generate(ddsbit bit.idl)
+SET(outsources)
+
+SET(outsources bit)
+
+list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+message(" CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}")
+include(idlc_generate_macro)
+
+# find_program(idcl_generate dds_idlc /home/firas/cyclone/cyclonedds/bld/src/idlc)
+# 
+# if(NOT idcl_generate)
+#   message(FATAL_ERROR "Failed to find idlc code generator ")
+# else()
+#     message("Find idlc  code generator")
+# endif()
+
+# message (${idcl_generate})
+message (" outsources = ${outsources}")
+
+message ("${idcl_generate} -d ${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/${outsources}.idl")
+    
+
+# ADD_CUSTOM_COMMAND (
+# OUTPUT ${outsource}.c ${outsources}.h 
+# COMMAND ${idcl_generate} ARGS -d ${CMAKE_CURRENT_SOURCE_DIR} -verbose ${CMAKE_CURRENT_BINARY_DIR}/bit.idl
+# COMMENT "Generating files in  ${CMAKE_CURRENT_SOURCE_DIR}  "
+# )
+idlc_generate_func(${CMAKE_CURRENT_SOURCE_DIR}/bit.idl)
+idlc_generate_func(${CMAKE_CURRENT_SOURCE_DIR}/../tests/helloworld.idl)
+
+add_library(ddstubs SHARED ${CMAKE_CURRENT_SOURCE_DIR}/dds_stubs.c)
+add_library(ddsbit SHARED ${CMAKE_CURRENT_SOURCE_DIR}/bit.c ${CMAKE_CURRENT_SOURCE_DIR}/bit.h )
+add_library(ddshelloworld SHARED ${CMAKE_CURRENT_SOURCE_DIR}/helloworld.c ${CMAKE_CURRENT_SOURCE_DIR}/helloworld.h )
+
+message("CMAKE_CURRENT_BINARY_DIR ==== ${CMAKE_CURRENT_BINARY_DIR} ")
+message("CMAKE_CURRENT_SOURCE_DIR ==== ${CMAKE_CURRENT_SOURCE_DIR} ")
+
 target_link_libraries(ddstubs ddsbit ddshelloworld CycloneDDS::ddsc)

bit/cmake/idlc_generate_macro.cmake

@@ -0,0 +1,81 @@
+#
+# Copyright(c) 2006 to 2018 ADLINK Technology Limited and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License
+# v. 1.0 which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+#
+
+
+
+#set(IDLC_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
+#set(IDLC "dds_idlc${EXTENSION}" CACHE STRING "")
+#mark_as_advanced(IDLC_DIR IDLC)
+
+#set(IDLC_SCRIPT_IN "${CMAKE_CURRENT_LIST_DIR}/dds_idlc${EXTENSION}.in")
+
+#configure_file(
+#    "${IDLC_SCRIPT_IN}" "${IDLC}"
+#    @ONLY
+#    NEWLINE_STYLE ${LINE_ENDINGS})
+#
+#if(NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows"))
+#    execute_process(COMMAND chmod +x "${IDLC_DIR}/${IDLC}")
+#endif()
+
+#add_custom_target(idlc ALL DEPENDS "${IDLC_JAR}")
+
+MACRO (idlc_generate_func idl_file)
+  message("idl_file: ${idl_file} ")
+  
+  if(idl_file STREQUAL "")
+    message(FATAL_ERROR "idlc_generate called without any idl files")
+  endif()
+
+  if (NOT IDLC_ARGS)
+     set(IDLC_ARGS)
+  endif()
+
+  set(_dir "${CMAKE_CURRENT_BINARY_DIR}")
+  set(_sources)
+  set(_headers)
+  
+  find_program(idcl_generate_full_path 
+                dds_idlc 
+                PATHS /tmp/cyclonedds/build/src/idlc)
+
+    if( idcl_generate_full_path STREQUAL "")
+        message(FATAL_ERROR "Failed to find idlc code generator ")
+    else()
+        message("${idcl_generate_full_path}: Found idlc  code generator")
+    endif()
+  
+  foreach(FIL ${idl_file})
+    message("file to parse ${FIL} ")
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WE ${FIL} NAME_WE)
+
+    set(_source "${CMAKE_CURRENT_SOURCE_DIR}/${FIL_WE}.c")
+    set(_header "${CMAKE_CURRENT_SOURCE_DIR}/${FIL_WE}.h")
+    
+    list(APPEND _sources "${_source}")
+    list(APPEND _headers "${_header}")
+
+    add_custom_command(
+      OUTPUT   "${_source}" "${_header}"
+      COMMAND  "${idcl_generate_full_path}"
+      ARGS     -d ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
+      COMMENT  "Running idlc on ${FIL}"
+      VERBATIM)
+  endforeach()
+  
+  message("sources ${_sources}" )
+  message("headers ${_headers}" )
+  
+  set_source_files_properties(${_sources} ${_headers} PROPERTIES GENERATED TRUE)
+  
+endmacro()