From 3e3d2066050881dc67706111708d8220c8b46d8c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 23 Sep 2014 12:10:53 +0200
Subject: [PATCH] Renamed Data Explorer executable.
---
Applications/DataExplorer/DataExplorer.cmake | 42 ++++++++++----------
Applications/DataExplorer/data-explorer.sh | 2 +-
FileIO/CMakeLists.txt | 2 +-
scripts/cmake/Coverage.cmake | 2 +-
scripts/cmake/Pack.cmake | 4 +-
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 91351597fe5..36a7d71724d 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -58,7 +58,7 @@ SOURCE_GROUP("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
SOURCE_GROUP("Moc Files" REGULAR_EXPRESSION "moc_.*")
# Create the library
-ADD_EXECUTABLE( ogs-gui MACOSX_BUNDLE
+ADD_EXECUTABLE( DataExplorer MACOSX_BUNDLE
main.cpp
${SOURCES}
${HEADERS}
@@ -68,7 +68,7 @@ ADD_EXECUTABLE( ogs-gui MACOSX_BUNDLE
${QTRESOURCES}
)
-TARGET_LINK_LIBRARIES( ogs-gui
+TARGET_LINK_LIBRARIES( DataExplorer
${QT_LIBRARIES}
ApplicationsLib
BaseLib
@@ -88,36 +88,36 @@ TARGET_LINK_LIBRARIES( ogs-gui
)
IF(VTK_NETCDF_FOUND)
- TARGET_LINK_LIBRARIES( ogs-gui vtkNetCDF vtkNetCDF_cxx )
+ TARGET_LINK_LIBRARIES( DataExplorer vtkNetCDF vtkNetCDF_cxx )
ELSE()
- TARGET_LINK_LIBRARIES( ogs-gui ${Shapelib_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( DataExplorer ${Shapelib_LIBRARIES} )
ENDIF () # Shapelib_FOUND
IF (GEOTIFF_FOUND)
- TARGET_LINK_LIBRARIES( ogs-gui ${GEOTIFF_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( DataExplorer ${GEOTIFF_LIBRARIES} )
ENDIF () # GEOTIFF_FOUND
-ADD_DEPENDENCIES ( ogs-gui VtkVis )
+ADD_DEPENDENCIES ( DataExplorer VtkVis )
IF(MSVC)
# Set linker flags
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT /IGNORE:4099")
- TARGET_LINK_LIBRARIES( ogs-gui winmm)
+ TARGET_LINK_LIBRARIES( DataExplorer winmm)
ENDIF(MSVC)
### OpenSG support ###
IF (VTKOSGCONVERTER_FOUND)
- USE_OPENSG(ogs-gui)
+ USE_OPENSG(DataExplorer)
INCLUDE_DIRECTORIES( ${VTKOSGCONVERTER_INCLUDE_DIRS} )
- TARGET_LINK_LIBRARIES( ogs-gui ${VTKOSGCONVERTER_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( DataExplorer ${VTKOSGCONVERTER_LIBRARIES} )
ENDIF ()
IF(VTKFBXCONVERTER_FOUND)
- TARGET_LINK_LIBRARIES(ogs-gui ${VTKFBXCONVERTER_LIBRARIES})
+ TARGET_LINK_LIBRARIES(DataExplorer ${VTKFBXCONVERTER_LIBRARIES})
ENDIF()
-SET_PROPERTY(TARGET ogs-gui PROPERTY FOLDER "DataExplorer")
+SET_PROPERTY(TARGET DataExplorer PROPERTY FOLDER "DataExplorer")
####################
@@ -134,26 +134,26 @@ IF(APPLE)
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "org.opengeosys")
SET(MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}")
- SET(MACOSX_BUNDLE_RESOURCES "${EXECUTABLE_OUTPUT_PATH}/ogs-gui.app/Contents/Resources")
+ SET(MACOSX_BUNDLE_RESOURCES "${EXECUTABLE_OUTPUT_PATH}/DataExplorer.app/Contents/Resources")
SET(MACOSX_BUNDLE_ICON "${ICONS_DIR}/${MACOSX_BUNDLE_ICON_FILE}")
#EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${MACOSX_BUNDLE_RESOURCES})
#EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MACOSX_BUNDLE_ICON} ${MACOSX_BUNDLE_RESOURCES})
- INSTALL (TARGETS ogs-gui DESTINATION .)
+ INSTALL (TARGETS DataExplorer DESTINATION .)
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(DeployQt4)
- INSTALL_QT4_EXECUTABLE(ogs-gui.app)
+ INSTALL_QT4_EXECUTABLE(DataExplorer.app)
RETURN()
ENDIF()
-INSTALL (TARGETS ogs-gui RUNTIME DESTINATION bin COMPONENT ogs_gui)
+INSTALL (TARGETS DataExplorer RUNTIME DESTINATION bin COMPONENT ogs_gui)
IF(MSVC)
- SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/Release/ogs-gui.exe)
+ SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/Release/DataExplorer.exe)
ELSE(MSVC)
- SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/ogs-gui)
+ SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/DataExplorer)
ENDIF(MSVC)
INCLUDE(GetPrerequisites)
@@ -163,7 +163,7 @@ IF(EXISTS ${OGS_GUI_EXE})
ELSE()
GET_PREREQUISITES(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 0 1 "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" "")
ENDIF()
- MESSAGE (STATUS "ogs-gui depends on:")
+ MESSAGE (STATUS "DataExplorer depends on:")
FOREACH(DEPENDENCY ${OGS_GUI_DEPENDENCIES})
IF(NOT ${DEPENDENCY} STREQUAL "not") # Some bug on Linux?
GP_RESOLVE_ITEM ("/" "${DEPENDENCY}" ${OGS_GUI_EXE} "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" DEPENDENCY_PATH)
@@ -179,9 +179,9 @@ IF(EXISTS ${OGS_GUI_EXE})
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
INSTALL(PROGRAMS data-explorer.sh DESTINATION . COMPONENT ogs_gui)
ENDIF()
- ADD_CUSTOM_COMMAND(TARGET ogs-gui POST_BUILD COMMAND ;) # For caching: excetuting empty command
+ ADD_CUSTOM_COMMAND(TARGET DataExplorer POST_BUILD COMMAND ;) # For caching: excetuting empty command
ELSE()
- # Run CMake after ogs-gui was built to run GetPrerequisites on executable
- ADD_CUSTOM_COMMAND(TARGET ogs-gui POST_BUILD COMMAND ${CMAKE_COMMAND}
+ # Run CMake after DataExplorer was built to run GetPrerequisites on executable
+ ADD_CUSTOM_COMMAND(TARGET DataExplorer POST_BUILD COMMAND ${CMAKE_COMMAND}
ARGS ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR} VERBATIM)
ENDIF()
diff --git a/Applications/DataExplorer/data-explorer.sh b/Applications/DataExplorer/data-explorer.sh
index 4f3156af1af..8cea9003395 100644
--- a/Applications/DataExplorer/data-explorer.sh
+++ b/Applications/DataExplorer/data-explorer.sh
@@ -1,3 +1,3 @@
# Startup script for running the packaged Data Explorer on Linux
cd bin
-LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ./ogs-gui
+LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ./DataExplorer
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 13fafee3719..df58998dd96 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -55,7 +55,7 @@ TARGET_LINK_LIBRARIES (FileIO
FILE(GLOB XSD_FILES . *.xsd)
IF(APPLE)
- INSTALL(FILES ${XSD_FILES} DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/OSX/DragNDrop/${CPACK_PACKAGE_FILE_NAME}/ogs-gui.app/Contents/MacOS)
+ INSTALL(FILES ${XSD_FILES} DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/OSX/DragNDrop/${CPACK_PACKAGE_FILE_NAME}/DataExplorer.app/Contents/MacOS)
ELSE()
INSTALL(FILES ${XSD_FILES} DESTINATION bin)
ENDIF()
diff --git a/scripts/cmake/Coverage.cmake b/scripts/cmake/Coverage.cmake
index 2da0edfb3b0..b691987f2f2 100644
--- a/scripts/cmake/Coverage.cmake
+++ b/scripts/cmake/Coverage.cmake
@@ -11,5 +11,5 @@ SET(COVERAGE_EXCLUDES
SETUP_TARGET_FOR_COVERAGE_COBERTURA(testrunner_coverage_cobertura testrunner "testrunner_coverage_cobertura_results" "-j;${PROCESSOR_COUNT}")
SETUP_TARGET_FOR_COVERAGE(testrunner_coverage testrunner "testrunner_coverage_results" "-j;${PROCESSOR_COUNT}")
IF(OGS_BUILD_GUI)
- SETUP_TARGET_FOR_COVERAGE(ogs-gui_coverage ogs-gui "ogs-gui_coverage_results")
+ SETUP_TARGET_FOR_COVERAGE(DataExplorer_coverage DataExplorer "DataExplorer_coverage_results")
ENDIF()
diff --git a/scripts/cmake/Pack.cmake b/scripts/cmake/Pack.cmake
index 429d0b833ce..d668b635167 100644
--- a/scripts/cmake/Pack.cmake
+++ b/scripts/cmake/Pack.cmake
@@ -53,7 +53,7 @@ ELSE() # APPLE
SET(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
IF(OGS_BUILD_GUI)
- SET(CPACK_PACKAGE_EXECUTABLES "ogs-gui" "OGS User Interface")
+ SET(CPACK_PACKAGE_EXECUTABLES "DataExplorer" "OGS User Interface")
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ogs_gui Unspecified)
SET(CPACK_COMPONENT_OGS_GUI_DISPLAY_NAME "Data Explorer")
SET(CPACK_COMPONENT_OGS_GUI_DESCRIPTION "The graphical user interface for OpenGeoSys")
@@ -71,7 +71,7 @@ IF(OGS_PACKAGE_ADDITIONAL_BINARIES)
GET_FILENAME_COMPONENT(ADDITIONAL_BINARY_NAME ${ADDITIONAL_BINARY} NAME)
MESSAGE(STATUS "Packaging additional binary: ${ADDITIONAL_BINARY_NAME}")
IF(APPLE)
- SET(INSTALL_LOCATION ogs-gui.app/Contents/MacOS)
+ SET(INSTALL_LOCATION DataExplorer.app/Contents/MacOS)
ELSE()
SET(INSTALL_LOCATION bin)
ENDIF()
--
GitLab