gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: simplify fluid build

Browse Source 
- define variable MAIN_FILES to avoid repetition
- make target_include_directories(fluid-lib) PUBLIC rather than PRIVATE
This commit is contained in:
Albrecht Schlosser 2025-04-04 15:54:36 +02:00
parent eb1e0f423d
commit 61f132845b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fluid/CMakeLists.txt
View File

@ -121,6 +121,8 @@ set(HEADERFILES
widgets/Node_Browser.h widgets/Node_Browser.h
) )
set(MAIN_FILES main.cxx main.h)
# Add ExternalCodeEditor: platform specific files # Add ExternalCodeEditor: platform specific files
if(WIN32) if(WIN32)
@ -137,8 +139,7 @@ source_group(
FILES FILES
${CPPFILES} ${CPPFILES}
${HEADERFILES} ${HEADERFILES}
main.cxx ${MAIN_FILES}
main.h
CMakeLists.txt CMakeLists.txt
) )
@ -147,7 +148,7 @@ source_group(
add_library(fluid-lib OBJECT EXCLUDE_FROM_ALL) add_library(fluid-lib OBJECT EXCLUDE_FROM_ALL)
target_sources(fluid-lib PRIVATE ${CPPFILES} ${HEADERFILES}) target_sources(fluid-lib PRIVATE ${CPPFILES} ${HEADERFILES})
target_include_directories(fluid-lib PRIVATE .) target_include_directories(fluid-lib PUBLIC .)
target_link_libraries(fluid-lib PUBLIC fltk::images) target_link_libraries(fluid-lib PUBLIC fltk::images)
# Build targets # Build targets
@ -158,7 +159,7 @@ if(APPLE AND NOT FLTK_BACKEND_X11)
set(ICON_NAME fluid.icns) set(ICON_NAME fluid.icns)
set(ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_NAME}") set(ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_NAME}")
add_executable(fluid MACOSX_BUNDLE main.cxx main.h ${ICON_PATH}) add_executable(fluid MACOSX_BUNDLE ${MAIN_FILES} ${ICON_PATH})
# create macOS bundle wrapper script # create macOS bundle wrapper script
@ -175,11 +176,10 @@ if(APPLE AND NOT FLTK_BACKEND_X11)
else() else()
# Option 'WIN32' builds a Windows GUI program, ignored on other platforms # Option 'WIN32' builds a Windows GUI program, ignored on other platforms
add_executable(fluid WIN32 main.cxx main.h) add_executable(fluid WIN32 ${MAIN_FILES})
endif() endif()
target_include_directories(fluid PRIVATE .)
target_link_libraries(fluid PRIVATE fluid-lib) target_link_libraries(fluid PRIVATE fluid-lib)
# Build the console app on Windows # Build the console app on Windows
@ -187,8 +187,7 @@ target_link_libraries(fluid PRIVATE fluid-lib)
if(WIN32) if(WIN32)
list(APPEND TARGETS fluid-cmd) list(APPEND TARGETS fluid-cmd)
add_executable(fluid-cmd main.cxx main.h) add_executable(fluid-cmd ${MAIN_FILES})
target_include_directories(fluid-cmd PRIVATE .)
target_link_libraries(fluid-cmd PRIVATE fluid-lib) target_link_libraries(fluid-cmd PRIVATE fluid-lib)
set(FLTK_FLUID_EXECUTABLE fltk::fluid-cmd) set(FLTK_FLUID_EXECUTABLE fltk::fluid-cmd)
else() else()