cmake: fix cmake build without internal jimtcl

Author: sobuch

.gitlab/ci/build.yml

@@ -85,7 +85,7 @@
   wget https://dl.espressif.com/dl/$JIMTCL_VER.tar.gz -O $JIMTCL_VER.tar.gz
   tar xzf $JIMTCL_VER.tar.gz && rm $JIMTCL_VER.tar.gz
   pushd $JIMTCL_VER
-  ./configure --prefix="$PWD/dist" --host=${CONF_HOST} --disable-shared CC=${HOST_CC}
+  ./configure --prefix="$PWD/dist" --host=${CONF_HOST} --disable-shared --with-ext=json --minimal --disable-ssl CC=${HOST_CC}
   make
   # Running "make" does not create this file for static builds on Windows but "make install" still expects it
   touch build-jim-ext

CMakeLists.txt

@@ -8,7 +8,17 @@ include(cmake/configure.cmake)
 
 add_executable(openocd)
 
-include(cmake/jimtcl.cmake)
+if(use_internal_jimtcl)
+	include(cmake/jimtcl.cmake)
+elseif(JIMTCL_FOUND)
+	add_library(libjimtcl INTERFACE)
+	target_include_directories(libjimtcl INTERFACE ${JIMTCL_INCLUDE_DIRS})
+	target_link_libraries(libjimtcl INTERFACE ${JIMTCL_LINK_LIBRARIES})
+elseif(have_jim_h)
+	add_library(libjimtcl INTERFACE)
+	target_link_libraries(libjimtcl INTERFACE jim)
+endif()
+
 add_subdirectory(src)
 
 # Propogate config.h which is auto-generated into the root directory.

cmake/BuildOptions.cmake

@@ -9,7 +9,7 @@ option(VERBOSE_JTAG_IO "Verbose JTAG I/O messages (for debugging)" OFF)
 option(VERBOSE_USB_IO "Verbose USB I/O messages (for debugging)" OFF)
 option(VERBOSE_USB_COMM "Verbose USB communication messages (for debugging)" OFF)
 option(MALLOC_LOGGING "Include free space in logging messages (requires malloc.h)" OFF)
-option(BUILD_DUMMY "Build the dummy port driver" OFF)
+option(BUILD_DUMMY "Build the dummy port driver" ON)
 option(BUILD_RSHIM "Build the rshim driver" OFF)
 option(BUILD_DMEM "Build the dmem driver" OFF)
 option(BUILD_PARPORT "Build the pc parallel port driver" OFF)
@@ -26,8 +26,9 @@ option(BUILD_EP93XX "Build support for EP93xx based SBCs" OFF)
 option(BUILD_AT91RM9200 "Build support for AT91RM9200 based SBCs" OFF)
 option(BUILD_GW16012 "Build support for the Gateworks GW16012 JTAG Programmer" OFF)
 option(BUILD_SYSFSGPIO "Build support for programming driven via sysfs gpios" OFF)
+option(BUILD_LINUXSPIDEV "Build support for Linux SPI device SWD adapter" OFF)
 option(BUILD_XLNX_PCIE_XVC "Build support for Xilinx XVC/PCIe" OFF)
-option(use_internal_jimtcl "Build internal jimtcl" ON)
+option(use_internal_jimtcl "Build internal jimtcl" OFF)
 option(use_internal_jimtcl_maintainer "Maintainer mode when building internal jimtcl" OFF)
 option(use_internal_libjaylink "Build internal libjaylink" OFF)
 option(BUILD_REMOTE_BITBANG "Build support for the Remote Bitbang driver" ON)

cmake/config.h.in

@@ -79,6 +79,9 @@
 /* 0 if you don't want SysfsGPIO driver */
 #cmakedefine01 BUILD_SYSFSGPIO
 
+/* 0 if you don't want Linux SPI SWD adapter driver */
+#cmakedefine01 BUILD_LINUXSPIDEV
+
 /* 0 if you don't want Xilinx XVC/PCIe driver */
 #cmakedefine01 BUILD_XLNX_PCIE_XVC
 

cmake/configure.cmake

@@ -141,6 +141,16 @@ if(ENABLE_CAPSTONE)
     endif()
 endif()
 
+pkg_check_modules(JIMTCL jimtcl>=0.79)
+if(NOT JIMTCL_FOUND AND NOT use_internal_jimtcl)
+    check_include_file(jim.h have_jim_h)
+    if(NOT have_jim_h)
+        message(FATAL_ERROR "Jim TCL package not found\n"
+            "Either configure to build version from submodule using 'cmake -D use_internal_jimtcl=ON', "
+            "or provide path to search for package configuration files in environment variable"
+            "'PKG_CONFIG_PATH' / 'OSXCROSS_PKG_CONFIG_PATH'")
+    endif()
+endif()
 
 # Process options
 if(doxygen_as_html)

cmake/jimtcl.cmake

@@ -3,7 +3,7 @@ include(ExternalProject)
 set(JIMTCL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jimtcl)
 set(JIMTCL_BIN ${CMAKE_CURRENT_BINARY_DIR}/jimtcl)
 set(JIMTCL_STATIC_LIB ${JIMTCL_DIR}/libjim.a)
-set(JIMTCL_INCLUDES ${JIMTCL_BIN})
+set(JIMTCL_INCLUDES ${JIMTCL_DIR})
 
 if(${CMAKE_CROSSCOMPILING})
 set(CONF_HOST --host=${host})

src/CMakeLists.txt

@@ -59,7 +59,7 @@ list(APPEND openocd_targets
 
 foreach(target ${openocd_targets})
 	target_compile_options(${target} PUBLIC ${OPENOCD_COMMON_COMPILER_FLAGS})
-	target_include_directories(${target} PUBLIC ${JIMTCL_DIR})
+	target_include_directories(${target} BEFORE PUBLIC $<TARGET_PROPERTY:libjimtcl,INTERFACE_INCLUDE_DIRECTORIES>)
 	target_include_directories(${target} BEFORE PUBLIC $<TARGET_PROPERTY:openocd,INTERFACE_INCLUDE_DIRECTORIES>)
 	target_include_directories(${target} BEFORE PUBLIC $<TARGET_PROPERTY:openocd_main,INTERFACE_INCLUDE_DIRECTORIES>)
 endforeach()

src/flash/nor/CMakeLists.txt

@@ -22,6 +22,7 @@ target_sources(nor PRIVATE
 	cc26xx.c
 	cfi.c
 	dsp5680xx_flash.c
+	dw-spi.c
 	efm32.c
 	em357.c
 	eneispif.c