diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-02-07 20:03:29 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-02-07 20:03:29 +0100 |
| commit | a1d3bf182e6c085779b6e7e7315bf15f384f7112 (patch) | |
| tree | 2e5ae2b980f1558476d70b837a5d81cf17ea092e /CMake/fl_add_library.cmake | |
| parent | fd5cd809356dc73d2ede5bb2f0db25098771cb8e (diff) | |
Fix GitHub CI build and minor CMake issues
- GitHub CI: fix wrong CMake option name
- fl_add_library: disable debug output (MSVC), fix formatting
Diffstat (limited to 'CMake/fl_add_library.cmake')
| -rw-r--r-- | CMake/fl_add_library.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
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) |