diff options
| -rw-r--r-- | cmake/platforms/emscripten.cmake | 2 | ||||
| -rw-r--r-- | cmake/platforms/nestedvm.cmake | 2 | ||||
| -rw-r--r-- | cmake/platforms/osx.cmake | 2 | ||||
| -rw-r--r-- | cmake/platforms/unix.cmake | 2 | ||||
| -rw-r--r-- | cmake/platforms/windows.cmake | 6 | ||||
| -rw-r--r-- | cmake/setup.cmake | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/cmake/platforms/emscripten.cmake b/cmake/platforms/emscripten.cmake index e13366f..1e2bf9a 100644 --- a/cmake/platforms/emscripten.cmake +++ b/cmake/platforms/emscripten.cmake @@ -81,7 +81,7 @@ endif() set(build_cli_programs FALSE) set(build_gui_programs FALSE) -function(get_platform_puzzle_extra_source_files OUTVAR NAME) +function(get_platform_puzzle_extra_source_files OUTVAR NAME AUXILIARY) set(${OUTVAR} PARENT_SCOPE) endfunction() diff --git a/cmake/platforms/nestedvm.cmake b/cmake/platforms/nestedvm.cmake index f400a75..342ae02 100644 --- a/cmake/platforms/nestedvm.cmake +++ b/cmake/platforms/nestedvm.cmake @@ -12,7 +12,7 @@ add_custom_target(nvm-puzzle-applet ${CMAKE_SOURCE_DIR}/PuzzleApplet.java DEPENDS ${CMAKE_SOURCE_DIR}/PuzzleApplet.java) -function(get_platform_puzzle_extra_source_files OUTVAR NAME) +function(get_platform_puzzle_extra_source_files OUTVAR NAME AUXILIARY) set(${OUTVAR} PARENT_SCOPE) endfunction() diff --git a/cmake/platforms/osx.cmake b/cmake/platforms/osx.cmake index 39cf544..59848db 100644 --- a/cmake/platforms/osx.cmake +++ b/cmake/platforms/osx.cmake @@ -10,7 +10,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64 x86_64) set(build_gui_programs FALSE) # they don't really fit in the OS X GUI model -function(get_platform_puzzle_extra_source_files OUTVAR NAME) +function(get_platform_puzzle_extra_source_files OUTVAR NAME AUXILIARY) set(${OUTVAR} PARENT_SCOPE) endfunction() diff --git a/cmake/platforms/unix.cmake b/cmake/platforms/unix.cmake index a582d6f..f150b46 100644 --- a/cmake/platforms/unix.cmake +++ b/cmake/platforms/unix.cmake @@ -63,7 +63,7 @@ endif() add_compile_definitions(HELP_DIR="${CMAKE_INSTALL_PREFIX}/share/sgt-puzzles/help") -function(get_platform_puzzle_extra_source_files OUTVAR NAME) +function(get_platform_puzzle_extra_source_files OUTVAR NAME AUXILIARY) if(build_icons AND EXISTS ${CMAKE_SOURCE_DIR}/icons/${NAME}.sav) # If we have the equipment to rebuild the puzzles' icon images # from scratch, do so. Then changes in the puzzle display code diff --git a/cmake/platforms/windows.cmake b/cmake/platforms/windows.cmake index d4b9092..5a0cf18 100644 --- a/cmake/platforms/windows.cmake +++ b/cmake/platforms/windows.cmake @@ -33,8 +33,10 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC") /wd4244 /wd4267 /wd4018 /wd4146 /wd4305") endif() -function(get_platform_puzzle_extra_source_files OUTVAR NAME) - set(${OUTVAR} ${CMAKE_SOURCE_DIR}/puzzles.rc PARENT_SCOPE) +function(get_platform_puzzle_extra_source_files OUTVAR NAME AUXILIARY) + if(NOT AUXILIARY) + set(${OUTVAR} ${CMAKE_SOURCE_DIR}/puzzles.rc PARENT_SCOPE) + endif() endfunction() function(set_platform_gui_target_properties TARGET) diff --git a/cmake/setup.cmake b/cmake/setup.cmake index 3b73739..ffb8019 100644 --- a/cmake/setup.cmake +++ b/cmake/setup.cmake @@ -128,7 +128,7 @@ function(puzzle NAME) set(puzzle_sources ${puzzle_sources} ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}.c PARENT_SCOPE) endif() - get_platform_puzzle_extra_source_files(extra_files ${NAME}) + get_platform_puzzle_extra_source_files(extra_files ${NAME} FALSE) if (build_individual_puzzles) add_executable(${EXENAME} ${NAME}.c ${extra_files}) @@ -173,7 +173,7 @@ function(guiprogram NAME) "" "" "COMPILE_DEFINITIONS" ${ARGN}) if(build_gui_programs) - get_platform_puzzle_extra_source_files(extra_files ${NAME}) + get_platform_puzzle_extra_source_files(extra_files ${NAME} TRUE) add_executable(${NAME} ${OPT_UNPARSED_ARGUMENTS} ${extra_files}) target_link_libraries(${NAME} common ${platform_gui_libs} ${platform_libs}) |