From ad05af6cefce2767364130856fb776c7939bb21f Mon Sep 17 00:00:00 2001 From: Matt Leotta Date: Wed, 21 Jul 2010 12:21:18 -0400 Subject: [PATCH] Copy start-up data files to the binary directory. This still needs a little work. The GUI should be able to find these files even if the program is run from another directory. --- CMakeLists.txt | 1 + gui/CMakeLists.txt | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db8f285..fa7e379 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ project(vehicle) find_package(VXL REQUIRED) +set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) set(DOCUMENTATION_OUTPUT_PATH ${CMAKE_BINARY_DIR}/doc) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 9aecac4..2d9c55b 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -43,25 +43,27 @@ IF(wxWidgets_FOUND) PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) - - IF(APPLE) + + + + if (APPLE) # use CoreFoundation to locate the default files in the bundle INCLUDE_DIRECTORIES(/System/Library/Frameworks/CoreFoundation.framework/Headers/) - ELSEIF(APPLE) + else (APPLE) # copy the default files to the binary directory CONFIGURE_FILE( ${pca_vehicle_wxgui_SOURCE_DIR}/default1.pca - ${pca_vehicle_wxgui_BINARY_DIR}/default1.pca COPY_ONLY ) + ${RUNTIME_OUTPUT_DIRECTORY}/default1.pca COPY_ONLY ) CONFIGURE_FILE( ${pca_vehicle_wxgui_SOURCE_DIR}/default2.pca - ${pca_vehicle_wxgui_BINARY_DIR}/default2.pca COPY_ONLY ) + ${RUNTIME_OUTPUT_DIRECTORY}/default2.pca COPY_ONLY ) CONFIGURE_FILE( ${pca_vehicle_wxgui_SOURCE_DIR}/default3.pca - ${pca_vehicle_wxgui_BINARY_DIR}/default3.pca COPY_ONLY ) + ${RUNTIME_OUTPUT_DIRECTORY}/default3.pca COPY_ONLY ) CONFIGURE_FILE( ${pca_vehicle_wxgui_SOURCE_DIR}/default_dodec.pca - ${pca_vehicle_wxgui_BINARY_DIR}/default_dodec.pca COPY_ONLY ) + ${RUNTIME_OUTPUT_DIRECTORY}/default_dodec.pca COPY_ONLY ) CONFIGURE_FILE( ${pca_vehicle_wxgui_SOURCE_DIR}/default_ferryman.pca - ${pca_vehicle_wxgui_BINARY_DIR}/default_ferryman.pca COPY_ONLY ) + ${RUNTIME_OUTPUT_DIRECTORY}/default_ferryman.pca COPY_ONLY ) CONFIGURE_FILE( ${pca_vehicle_wxgui_SOURCE_DIR}/default.parts - ${pca_vehicle_wxgui_BINARY_DIR}/default.parts COPY_ONLY ) - ENDIF(APPLE) + ${RUNTIME_OUTPUT_DIRECTORY}/default.parts COPY_ONLY ) + endif (APPLE) WXWIDGETS_ADD_RESOURCES(pca_vehicle_wxgui_sources pca_vehicle.xrc)