diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5c8070afdd27fdeca462071ce48ffdcf7de6ade..644d49e8147b0a48933b65ff8f38a965e775bbcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,11 +91,8 @@ ENDIF (OGS_BUILD_INFO)
OPTION(OGS_COVERAGE "Enables code coverage measurements with gcov/lcov." OFF)
# Packaging
-OPTION(OGS_PACKAGING "Creating installers / packages" OFF)
-OPTION_REQUIRES(OGS_PACKAGING_ZIP "Do you want to package as zip?" OGS_PACKAGING)
-IF(OGS_PACKAGING)
- INCLUDE( scripts/cmake/Pack.cmake)
-ENDIF() #OGS_PACKAGING
+OPTION(OGS_PACKAGING_ZIP "Do you want to package as zip?")
+INCLUDE(scripts/cmake/Pack.cmake)
######################
### Subdirectories ###
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 628bbb18a53b53c6c5b2fe58dc869f5ded1a14f9..a43270cd597ab19dbe5df787e6605e94ea7fabf6 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -49,7 +49,5 @@ TARGET_LINK_LIBRARIES (FileIO
shp
)
-IF (OGS_PACKAGING)
- FILE(GLOB XSD_FILES . *.xsd)
- INSTALL (FILES ${XSD_FILES} DESTINATION bin)
-ENDIF()
+FILE(GLOB XSD_FILES . *.xsd)
+INSTALL (FILES ${XSD_FILES} DESTINATION bin)
diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index 857edd5bf14cae839564d12bb928ffdef0e8781f..485583cf46e10e239a4dce47f615aa8fe0842dd0 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -132,57 +132,55 @@ set_property(TARGET ogs-gui PROPERTY FOLDER "DataExplorer")
### Installation ###
####################
-IF (OGS_PACKAGING)
- IF(APPLE)
- SET(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${OGS_VERSION}")
- SET(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${OGS_VERSION}")
- SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${OGS_VERSION}")
- SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${OGS_VERSION}")
- SET(MACOSX_BUNDLE_COPYRIGHT "2013 OpenGeoSys Community")
- #SET(MACOSX_BUNDLE_ICON_FILE "audio-input-microphone.icns")
- 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_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 .)
- SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
- INCLUDE(InstallRequiredSystemLibraries)
- INCLUDE(DeployQt4)
- INSTALL_QT4_EXECUTABLE(ogs-gui.app)
-
- RETURN()
- ENDIF()
+IF(APPLE)
+ SET(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${OGS_VERSION}")
+ SET(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${OGS_VERSION}")
+ SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${OGS_VERSION}")
+ SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${OGS_VERSION}")
+ SET(MACOSX_BUNDLE_COPYRIGHT "2013 OpenGeoSys Community")
+ #SET(MACOSX_BUNDLE_ICON_FILE "audio-input-microphone.icns")
+ 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_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 .)
+ SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
+ INCLUDE(InstallRequiredSystemLibraries)
+ INCLUDE(DeployQt4)
+ INSTALL_QT4_EXECUTABLE(ogs-gui.app)
+
+ RETURN()
+ENDIF()
- INSTALL (TARGETS ogs-gui RUNTIME DESTINATION bin COMPONENT ogs_gui)
-
- IF(MSVC)
- SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/Release/ogs-gui.exe)
- ELSE(MSVC)
- SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/ogs-gui)
- ENDIF(MSVC)
-
- INCLUDE(GetPrerequisites)
- IF (EXISTS ${OGS_GUI_EXE})
- GET_PREREQUISITES(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 0 1 "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" "")
- MESSAGE (STATUS "ogs-gui 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)
- GET_FILENAME_COMPONENT(RESOLVED_DEPENDENCY_PATH "${DEPENDENCY_PATH}" REALPATH)
- STRING(TOLOWER ${DEPENDENCY} DEPENDENCY_LOWER)
- IF("${DEPENDENCY_LOWER}" MATCHES "tiff|blas|lapack|proj|jpeg|qt|gfortran|vtk")
- SET(DEPENDENCY_PATHS ${DEPENDENCY_PATHS} ${RESOLVED_DEPENDENCY_PATH} ${DEPENDENCY_PATH})
- MESSAGE(" ${DEPENDENCY}")
- ENDIF()
+INSTALL (TARGETS ogs-gui RUNTIME DESTINATION bin COMPONENT ogs_gui)
+
+IF(MSVC)
+ SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/Release/ogs-gui.exe)
+ELSE(MSVC)
+ SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/ogs-gui)
+ENDIF(MSVC)
+
+INCLUDE(GetPrerequisites)
+IF (EXISTS ${OGS_GUI_EXE})
+ GET_PREREQUISITES(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 0 1 "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" "")
+ MESSAGE (STATUS "ogs-gui 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)
+ GET_FILENAME_COMPONENT(RESOLVED_DEPENDENCY_PATH "${DEPENDENCY_PATH}" REALPATH)
+ STRING(TOLOWER ${DEPENDENCY} DEPENDENCY_LOWER)
+ IF("${DEPENDENCY_LOWER}" MATCHES "tiff|blas|lapack|proj|jpeg|qt|gfortran|vtk")
+ SET(DEPENDENCY_PATHS ${DEPENDENCY_PATHS} ${RESOLVED_DEPENDENCY_PATH} ${DEPENDENCY_PATH})
+ MESSAGE(" ${DEPENDENCY}")
ENDIF()
- ENDFOREACH (DEPENDENCY IN ${OGS_GUI_DEPENDENCIES})
- INSTALL (FILES ${DEPENDENCY_PATHS} DESTINATION bin COMPONENT ogs_gui)
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- INSTALL(PROGRAMS data-explorer.sh DESTINATION . COMPONENT ogs_gui)
ENDIF()
- ENDIF (EXISTS ${OGS_GUI_EXE})
-ENDIF (OGS_PACKAGING)
+ ENDFOREACH (DEPENDENCY IN ${OGS_GUI_DEPENDENCIES})
+ INSTALL (FILES ${DEPENDENCY_PATHS} DESTINATION bin COMPONENT ogs_gui)
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ INSTALL(PROGRAMS data-explorer.sh DESTINATION . COMPONENT ogs_gui)
+ ENDIF()
+ENDIF (EXISTS ${OGS_GUI_EXE})
diff --git a/Utils/FileConverter/CMakeLists.txt b/Utils/FileConverter/CMakeLists.txt
index c2ecea322d7b984927f4f023cb75690df37e1041..b7c8c3bba8ed1f9f4a1ada4f0913df208bb68f10 100644
--- a/Utils/FileConverter/CMakeLists.txt
+++ b/Utils/FileConverter/CMakeLists.txt
@@ -24,9 +24,7 @@ TARGET_LINK_LIBRARIES( ConvertSHPToGLI
${QT_LIBRARIES}
)
-IF (OGS_PACKAGING)
- INSTALL ( TARGETS ConvertSHPToGLI RUNTIME DESTINATION bin COMPONENT ConvertSHPToGLI )
-ENDIF (OGS_PACKAGING)
+INSTALL ( TARGETS ConvertSHPToGLI RUNTIME DESTINATION bin COMPONENT ConvertSHPToGLI )
IF (QT4_FOUND)
ADD_EXECUTABLE (generateBCandGLI generateBCandGLI.cpp )
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 134c9c1b21bd12899e1d7f51560d653e58bde56a..ec228d349b7a913c71668abc27f22c6b939ef4a1 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -43,11 +43,8 @@ FIND_PROGRAM(BASH_TOOL_PATH bash
HINTS ${GITHUB_BIN_DIR} DOC "The bash executable")
# Dumpbin is a windows dependency analaysis tool required for packaging
-IF(WIN32 AND OGS_PACKAGING)
+IF(WIN32)
FIND_PROGRAM(DUMPBIN_TOOL_PATH dumpbin DOC "Windows dependency analysis tool")
- IF(NOT DUMPBIN_TOOL_PATH)
- MESSAGE(FATAL_ERROR "Dumpbin was not found but is required for packaging!")
- ENDIF()
ENDIF()
########################
@@ -127,12 +124,12 @@ ENDIF()
IF(OGS_USE_PETSC)
MESSAGE (STATUS "Configuring for PETSc" )
-
+
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scripts/cmake/findPETSC)
FIND_PACKAGE(PETSc REQUIRED)
-
+
include_directories(
- ${PETSC_INCLUDES}
+ ${PETSC_INCLUDES}
)
FIND_PACKAGE(MPI REQUIRED)