mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move getopt out of the frontend, because it's used in the backend's test, too

Browse Source
This commit is contained in:
Schaich 2021-03-30 19:00:24 +09:00
parent 779a318c93
commit 88bbeb862b
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -29,6 +29,7 @@ option(ZINT_USE_QT "Build with QT support" ON)
include(SetPaths.cmake) include(SetPaths.cmake)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(CheckFunctionExists)
check_cxx_compiler_flag("-Wall" CXX_COMPILER_FLAG_WALL) check_cxx_compiler_flag("-Wall" CXX_COMPILER_FLAG_WALL)
if(CXX_COMPILER_FLAG_WALL) if(CXX_COMPILER_FLAG_WALL)
@ -89,6 +90,11 @@ IF(APPLE)
ENDIF (UNIVERSAL) ENDIF (UNIVERSAL)
ENDIF(APPLE) ENDIF(APPLE)
check_function_exists(getopt HAVE_GETOPT)
if(NOT HAVE_GETOPT)
add_subdirectory(getopt)
endif(NOT HAVE_GETOPT)
add_subdirectory(backend) add_subdirectory(backend)
add_subdirectory(frontend) add_subdirectory(frontend)

6
backend/tests/CMakeLists.txt
View File

@ -28,11 +28,17 @@ set(testcommon_SRCS testcommon.c testcommon.h)
add_library(testcommon ${testcommon_SRCS}) add_library(testcommon ${testcommon_SRCS})
target_link_libraries(testcommon zint) target_link_libraries(testcommon zint)
target_include_directories(testcommon PUBLIC ${zint_backend_tests_SOURCE_DIR}) target_include_directories(testcommon PUBLIC ${zint_backend_tests_SOURCE_DIR})
if(NOT HAVE_GETOPT)
target_link_libraries(testcommon zint_bundled_getopt)
endif()
if(ZINT_STATIC) if(ZINT_STATIC)
add_library(testcommon-static ${testcommon_SRCS}) add_library(testcommon-static ${testcommon_SRCS})
target_link_libraries(testcommon-static zint-static) target_link_libraries(testcommon-static zint-static)
target_include_directories(testcommon-static PUBLIC ${zint_backend_tests_SOURCE_DIR}) target_include_directories(testcommon-static PUBLIC ${zint_backend_tests_SOURCE_DIR})
if(NOT HAVE_GETOPT)
target_link_libraries(testcommon-static zint_bundled_getopt)
endif()
endif() endif()
zint_add_test(2of5 test_2of5) zint_add_test(2of5 test_2of5)

11
frontend/CMakeLists.txt
View File

@ -2,16 +2,8 @@
project(zint_frontend) project(zint_frontend)
include(CheckFunctionExists)
check_function_exists(getopt HAVE_GETOPT)
set(zint_frontend_SRCS main.c) set(zint_frontend_SRCS main.c)
if(NOT HAVE_GETOPT)
set(zint_frontend_SRCS ${zint_frontend_SRCS} getopt.c getopt1.c)
endif(NOT HAVE_GETOPT)
include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend") include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend")
add_executable(zint_frontend ${zint_frontend_SRCS}) add_executable(zint_frontend ${zint_frontend_SRCS})
@ -19,6 +11,9 @@ add_executable(zint_frontend ${zint_frontend_SRCS})
set_target_properties(zint_frontend PROPERTIES OUTPUT_NAME "zint") set_target_properties(zint_frontend PROPERTIES OUTPUT_NAME "zint")
target_link_libraries(zint_frontend zint) target_link_libraries(zint_frontend zint)
if(NOT HAVE_GETOPT)
target_link_libraries(zint_frontend zint_bundled_getopt)
endif(NOT HAVE_GETOPT)
install(TARGETS zint_frontend DESTINATION "${BIN_INSTALL_DIR}" RUNTIME) install(TARGETS zint_frontend DESTINATION "${BIN_INSTALL_DIR}" RUNTIME)

4
getopt/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
project(zint_bundled_getopt)
add_library(zint_bundled_getopt STATIC getopt.c getopt1.c)
target_include_directories(zint_bundled_getopt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

0
frontend/getopt.c → getopt/getopt.c
View File

0
frontend/getopt.h → getopt/getopt.h
View File

0
frontend/getopt1.c → getopt/getopt1.c
View File