commit 2b77870fa94a8450f678fd9cf20f9c36f77d84bc
author Jan Kundrát <jan.kundrat@cesnet.cz> Fri Dec 17 16:19:23 2021 +0100
committer Michal Vasko <mvasko@cesnet.cz> Tue Mar 15 11:36:42 2022 +0100
tree 462fb89ed016476d53075ce77dc0bcc336431d98
parent 3d158c61feb7dc4b30cde763dd86fccfe788a3f1

Windows: do not skip building `yangre`

It looks like I excluded this by mistake; the `getopt` library is
already used by `yanglint` anyway.

Fixes: 2e3f935e MSVC: tools: disable interactive tools

tools/CMakeLists.txt

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 94b4eed..b92f80c 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,11 +1,15 @@
 # config file for tools
 configure_file(${PROJECT_SOURCE_DIR}/tools/config.h.in ${PROJECT_BINARY_DIR}/tools/config.h @ONLY)
 
-add_subdirectory(lint)
-if(NOT WIN32)
-    add_subdirectory(re)
+if(WIN32)
+    find_library(GETOPT_LIBRARY NAMES getopt REQUIRED)
+    find_path(GETOPT_INCLUDE_DIR NAMES getopt.h REQUIRED)
+    message(STATUS "Found <getopt.h> at ${GETOPT_INCLUDE_DIR}, library at ${GETOPT_LIBRARY}")
 endif()
 
+add_subdirectory(lint)
+add_subdirectory(re)
+
 set(format_sources
     ${format_sources}
     PARENT_SCOPE)

tools/lint/CMakeLists.txt

diff --git a/tools/lint/CMakeLists.txt b/tools/lint/CMakeLists.txt
index 8b9d26a..871e6d6 100644
--- a/tools/lint/CMakeLists.txt
+++ b/tools/lint/CMakeLists.txt
@@ -43,9 +43,6 @@
 target_include_directories(yanglint BEFORE PRIVATE ${PROJECT_BINARY_DIR})
 
 if(WIN32)
-    find_library(GETOPT_LIBRARY NAMES getopt REQUIRED)
-    find_path(GETOPT_INCLUDE_DIR NAMES getopt.h REQUIRED)
-    message(STATUS "Found <getopt.h> at ${GETOPT_INCLUDE_DIR}, library at ${GETOPT_LIBRARY}")
     target_include_directories(yanglint PRIVATE ${GETOPT_INCLUDE_DIR})
     target_link_libraries(yanglint ${GETOPT_LIBRARY})
 endif()

tools/re/CMakeLists.txt

diff --git a/tools/re/CMakeLists.txt b/tools/re/CMakeLists.txt
index f977e3c..7b6de22 100644
--- a/tools/re/CMakeLists.txt
+++ b/tools/re/CMakeLists.txt
@@ -13,3 +13,8 @@
 install(TARGETS yangre DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${PROJECT_SOURCE_DIR}/tools/re/yangre.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 target_include_directories(yangre BEFORE PRIVATE ${PROJECT_BINARY_DIR})
+
+if(WIN32)
+    target_include_directories(yangre PRIVATE ${GETOPT_INCLUDE_DIR})
+    target_link_libraries(yangre ${GETOPT_LIBRARY})
+endif()