DO NOT REPLY TO THIS MESSAGE.  INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.

[STR New]

Link: http://www.fltk.org/str.php?L2317
Version: 1.3-current





Link: http://www.fltk.org/str.php?L2317
Version: 1.3-current
diff -Naur fltk-1.3.x-r7339.patched//CMake/FLTKConfig.cmake.in 
fltk-1.3.x-r7339/CMake/FLTKConfig.cmake.in
--- fltk-1.3.x-r7339.patched//CMake/FLTKConfig.cmake.in 2010-03-27 
11:37:00.000000000 -0400
+++ fltk-1.3.x-r7339/CMake/FLTKConfig.cmake.in  2010-03-31 15:41:50.000000000 
-0400
@@ -7,7 +7,7 @@
 set(FLTK_FOUND TRUE)
 set(FLTK_VERSION @FLTK_VERSION_FULL@)
 
-set(FLTK_FLUID_EXECUTABLE "@FLTK_FLUID_PATH@")
+set(FLTK_FLUID_EXECUTABLE "@PREFIX_BIN@/fluid")
 
 if(NOT "@EXE_LINKER_FLAGS@" STREQUAL "")
    set(FLTK_EXE_LINKER_FLAGS "@EXE_LINKER_FLAGS@")
diff -Naur fltk-1.3.x-r7339.patched//CMakeLists.txt 
fltk-1.3.x-r7339/CMakeLists.txt
--- fltk-1.3.x-r7339.patched//CMakeLists.txt    2010-03-31 15:44:34.000000000 
-0400
+++ fltk-1.3.x-r7339/CMakeLists.txt     2010-03-31 15:29:31.000000000 -0400
@@ -566,7 +566,7 @@
 else()
    add_subdirectory(fluid)
    set(FLTK_FLUID_EXECUTABLE fluid)
-   set(FLTK_FLUID_PATH ${PREFIX_BIN}/${FLTK_FLUID_EXECUTABLE})
+   set(FLTK_FLUID_PATH ${EXECUTABLE_OUTPUT_PATH}/${FLTK_FLUID_EXECUTABLE})
 endif(CMAKE_CROSSCOMPILING)
 
 add_subdirectory(src)
@@ -601,7 +601,7 @@
 string(REPLACE ";" " " LD_LIBS "${FLTK_LDLIBS}")
 
 configure_file(${FLTK_SOURCE_DIR}/fltk-config.cmake.in
-   ${FLTK_BINARY_DIR}/bin/fltk-config
+   ${FLTK_BINARY_DIR}/fltk-config
    )
 
 # generate uninstall target
@@ -633,8 +633,9 @@
    DESTINATION ${PREFIX_INCLUDE} USE_SOURCE_PERMISSIONS
    )
 
-install(PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/fltk-config
+install(PROGRAMS ${FLTK_BINARY_DIR}/fltk-config
    DESTINATION ${PREFIX_BIN}
+   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE 
WORLD_READ WORLD_EXECUTE
    OPTIONAL
    )
 
diff -Naur fltk-1.3.x-r7339.patched//fluid/CMakeLists.txt 
fltk-1.3.x-r7339/fluid/CMakeLists.txt
--- fltk-1.3.x-r7339.patched//fluid/CMakeLists.txt      2010-03-31 
15:44:34.000000000 -0400
+++ fltk-1.3.x-r7339/fluid/CMakeLists.txt       2010-03-31 15:29:27.000000000 
-0400
@@ -1,4 +1,3 @@
-set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin)
 
 set(CPPFILES
        CodeEditor.cxx
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs

Reply via email to