CMake: Make compile definitions 'FL_LIBRARY' and 'FL_DLL' private
... so they are not inherited by consumers of the library. Remove 'add_definitions(-DFL_LIBRARY)' from src/CMakeLists.txt This is not necessary, see CMake/fl_add_library.cmake Don't set obsolete property 'CLEAN_DIRECT_OUTPUT' which was removed in CMake 2.8.0.
This commit is contained in:
parent
b328c1f902
commit
d11c412f95
@ -37,13 +37,13 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
||||
|
||||
add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
|
||||
|
||||
# target properties for all libraries
|
||||
# Target properties for all libraries
|
||||
|
||||
set_target_properties(${TARGET_NAME}
|
||||
PROPERTIES
|
||||
CLEAN_DIRECT_OUTPUT TRUE
|
||||
COMPILE_DEFINITIONS "FL_LIBRARY"
|
||||
)
|
||||
# Set 'PRIVATE' target compile definitions for the library
|
||||
# so they are not inherited by consumers
|
||||
|
||||
target_compile_definitions(${TARGET_NAME}
|
||||
PRIVATE "FL_LIBRARY")
|
||||
|
||||
# additional target properties for static libraries
|
||||
|
||||
@ -105,11 +105,9 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
||||
endif (OPTION_LARGE_FILE)
|
||||
|
||||
if (${LIBTYPE} STREQUAL "SHARED")
|
||||
set_target_properties(${TARGET_NAME}
|
||||
PROPERTIES
|
||||
COMPILE_DEFINITIONS "FL_DLL"
|
||||
)
|
||||
endif (${LIBTYPE} STREQUAL "SHARED")
|
||||
target_compile_definitions(${TARGET_NAME}
|
||||
PRIVATE "FL_DLL")
|
||||
endif ()
|
||||
endif (MSVC)
|
||||
|
||||
install (TARGETS ${TARGET_NAME}
|
||||
|
@ -580,8 +580,6 @@ if (WIN32)
|
||||
list (APPEND STATIC_FILES fl_call_main.c)
|
||||
endif (WIN32)
|
||||
|
||||
add_definitions(-DFL_LIBRARY)
|
||||
|
||||
#######################################################################
|
||||
|
||||
# prepare optional libs for shared and static FLTK libraries
|
||||
|
Loading…
Reference in New Issue
Block a user