diff options
Diffstat (limited to 'CMake/export.cmake')
| -rw-r--r-- | CMake/export.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CMake/export.cmake b/CMake/export.cmake index 9f8170051..828d4370d 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake @@ -21,16 +21,7 @@ # Set the fluid executable path used to create .cxx/.h from .fl files -if (CMAKE_CROSSCOMPILING) - # find a fluid executable on the host system - find_file(FLUID_PATH - NAMES fluid fluid.exe - PATHS ENV PATH - NO_CMAKE_FIND_ROOT_PATH - ) - set (FLTK_FLUID_EXECUTABLE ${FLUID_PATH}) - set (FLUID_EXPORT "") # don't export fluid -else () +if (FLTK_BUILD_FLUID AND NOT CMAKE_CROSSCOMPILING) # use the fluid executable we build if (WIN32) set (FLTK_FLUID_EXECUTABLE fluid-cmd) @@ -39,7 +30,16 @@ else () set (FLTK_FLUID_EXECUTABLE fluid) set (FLUID_EXPORT fluid) # export fluid endif () -endif (CMAKE_CROSSCOMPILING) +else () + # find a fluid executable on the host system + find_file(FLUID_PATH + NAMES fluid fluid.exe + PATHS ENV PATH + NO_CMAKE_FIND_ROOT_PATH + ) + set (FLTK_FLUID_EXECUTABLE ${FLUID_PATH}) + set (FLUID_EXPORT "") # don't export fluid +endif (FLTK_BUILD_FLUID AND NOT CMAKE_CROSSCOMPILING) # generate FLTK-Targets.cmake for build directory use export (TARGETS ${FLUID_EXPORT} ${FLTK_LIBRARIES} FILE ${CMAKE_CURRENT_BINARY_DIR}/FLTK-Targets.cmake) |