cmake improvements and fixes to Fl_Text_Display construction #4
Conversation
This is to make it possible to use fltk as a subdirectory.
git-svn-id: http://seriss.com/public/fltk/fltk/branches/branch-1.4@12530 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
|
Thanks for the patches and the pull request. AFAICT both patches look good. As you noticed we don't use PR's (and we can't merge them directly because our main source repository is svn). As it seems Greg will take care of the Fl_Text_Display c'tor issue (STR #3361). I'll take care of the CMake issues and commit via svn -> git (on GitHub). |
|
Good if you can include my cmake changes on branch-1.4 so I can test changes easily. |
Basically replace CMAKE_XXX_DIR with CMAKE_CURRENT_XXX_DIR where XXX = SOURCE or BINARY. Patch proposal by cleanrock, FLTK PR #4: #4 Patch modified to fix target dirs for test programs and doxygen docs. git-svn-id: http://seriss.com/public/fltk/fltk/branches/branch-1.4@12630 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
|
@cleanrock: Thanks again for the patch(es). As you can see I committed your CMake changes with some modifications. I hope this fixes the issue for you and I'd like you to test and confirm. If you find any issues please report here; I'll leave this PR open for now. I believe the Fl_Text_Display issues have been resolved as well, although I don't know the exact commit. Again, please post here if you find any remaining issues. TIA. |
|
Looks good for me, thanks. |
|
Okay, thanks for the confirmation. Closing this PR since it is resolved. Note to later readers: this PR will not be merged since the main branch (branch-1.4) has been updated with subversion, our current source code management system. |
Basically replace CMAKE_XXX_DIR with CMAKE_CURRENT_XXX_DIR where XXX = SOURCE or BINARY. Patch proposal by cleanrock, FLTK PR #4: fltk/test-only#4 Patch modified to fix target dirs for test programs and doxygen docs. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12630 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Basically replace CMAKE_XXX_DIR with CMAKE_CURRENT_XXX_DIR where XXX = SOURCE or BINARY. Patch proposal by cleanrock, FLTK PR #4: fltk/test-only#4 Patch modified to fix target dirs for test programs and doxygen docs. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12630 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
I realize you probably do not accept pull requests since this is a test repo.
See http://www.fltk.org/str.php?L3361 .