diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMake/fl_add_library.cmake | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbb1ecf36..5bad59d49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: # Note the current convention is to use the -S and -B options here to specify source # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 - run: cmake $GITHUB_WORKSPACE -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D FLTK_OPTION_USE_WAYLAND=OFF -D CMAKE_CXX_STANDARD=98 -D CMAKE_CXX_EXTENSIONS=OFF -D CMAKE_C_FLAGS_INIT="-Wall -Wunused" -D CMAKE_CXX_FLAGS_INIT="-Wall -Wunused" + run: cmake $GITHUB_WORKSPACE -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D FLTK_BACKEND_WAYLAND=OFF -D CMAKE_CXX_STANDARD=98 -D CMAKE_CXX_EXTENSIONS=OFF -D CMAKE_C_FLAGS_INIT="-Wall -Wunused" -D CMAKE_CXX_FLAGS_INIT="-Wall -Wunused" - name: Build working-directory: ${{github.workspace}}/build diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake index a64f998d7..150125a0f 100644 --- a/CMake/fl_add_library.cmake +++ b/CMake/fl_add_library.cmake @@ -39,7 +39,7 @@ # ####################################################################### -function (fl_add_library LIBNAME LIBTYPE SOURCES) +function(fl_add_library LIBNAME LIBTYPE SOURCES) # message(STATUS "Building library **************** ${LIBNAME} ${LIBTYPE}") @@ -82,7 +82,7 @@ function (fl_add_library LIBNAME LIBTYPE SOURCES) endif() set(alias_name "fltk::${alias_name}${suffix}") - add_library (${alias_name} ALIAS ${TARGET_NAME}) + add_library(${alias_name} ALIAS ${TARGET_NAME}) if(0) fl_debug_var(TARGET_NAME) @@ -96,7 +96,7 @@ function (fl_add_library LIBNAME LIBTYPE SOURCES) # Set 'PRIVATE' target compile definitions for the library # so they are not inherited by consumers - target_compile_definitions (${TARGET_NAME} PRIVATE "FL_LIBRARY") + target_compile_definitions(${TARGET_NAME} PRIVATE "FL_LIBRARY") # Set PUBLIC include and linker directories @@ -195,7 +195,7 @@ function (fl_add_library LIBNAME LIBTYPE SOURCES) OUTPUT_NAME_DEBUG ${LIBNAME}_dlld OUTPUT_NAME_RELEASE ${LIBNAME}_dll ) - target_compile_definitions (${TARGET_NAME} PRIVATE FL_DLL) + target_compile_definitions(${TARGET_NAME} PRIVATE FL_DLL) endif(MSVC) endif(LIBTYPE STREQUAL "SHARED") @@ -203,11 +203,11 @@ function (fl_add_library LIBNAME LIBTYPE SOURCES) set(DEBUG_ONAME 0) if(DEBUG_ONAME) - get_target_property (XX_NAME ${TARGET_NAME} NAME) - get_target_property (XX_ONAME ${TARGET_NAME} OUTPUT_NAME) - get_target_property (XX_ONAME_DEBUG ${TARGET_NAME} OUTPUT_NAME_DEBUG) - get_target_property (XX_ONAME_RELEASE ${TARGET_NAME} OUTPUT_NAME_RELEASE) - get_target_property (XX_EXPORT_NAME ${TARGET_NAME} EXPORT_NAME) + get_target_property(XX_NAME ${TARGET_NAME} NAME) + get_target_property(XX_ONAME ${TARGET_NAME} OUTPUT_NAME) + get_target_property(XX_ONAME_DEBUG ${TARGET_NAME} OUTPUT_NAME_DEBUG) + get_target_property(XX_ONAME_RELEASE ${TARGET_NAME} OUTPUT_NAME_RELEASE) + get_target_property(XX_EXPORT_NAME ${TARGET_NAME} EXPORT_NAME) message(STATUS "--- DEBUG_ONAME ---") fl_debug_var(TARGET_NAME) @@ -221,8 +221,8 @@ function (fl_add_library LIBNAME LIBTYPE SOURCES) if(MSVC) if(FLTK_OPTION_LARGE_FILE) - fl_debug_var(FLTK_OPTION_LARGE_FILE) - fl_debug_var(TARGET_NAME) + # fl_debug_var(FLTK_OPTION_LARGE_FILE) + # fl_debug_var(TARGET_NAME) set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE ) @@ -251,4 +251,4 @@ function (fl_add_library LIBNAME LIBTYPE SOURCES) message("") endif() -endfunction (fl_add_library LIBNAME LIBTYPE SOURCES) +endfunction(fl_add_library LIBNAME LIBTYPE SOURCES) |