Zip-packaging works on Windows.

BaseLib/CMakeLists.txt

@@ -17,7 +17,4 @@ INCLUDE_DIRECTORIES(
 ADD_SUBDIRECTORY(logog)
 SET_PROPERTY(TARGET Continuous PROPERTY FOLDER "logog")
 SET_PROPERTY(TARGET logog PROPERTY FOLDER "logog")
-IF (DOXYGEN_FOUND)
-	SET_PROPERTY(TARGET logog-doc PROPERTY FOLDER "logog")
-ENDIF ()
 SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog")

BaseLib/logog/CMakeLists.txt

@@ -42,14 +42,16 @@ set_target_properties(logog PROPERTIES DEBUG_POSTFIX "d")
 add_executable( test-logog test/test.cpp )
 target_link_libraries( test-logog logog ${CMAKE_THREAD_LIBS_INIT})
 add_test( NAME test-harness COMMAND test-logog )
-install(TARGETS logog ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/logog"
+if (CMAKE_PROJECT_NAME STREQUAL logog)
+	install(TARGETS logog ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+	install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/logog"
           FILES_MATCHING PATTERN "*.hpp")
 
-# Docs generation with Doxygen
-find_package( Doxygen )
-if( DOXYGEN_FOUND )
-	add_custom_target (logog-doc ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doxyfile
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMENT "Generating source code documentation with Doxygen." VERBATIM)
-endif() # DOXYGEN_FOUND
\ No newline at end of file
+	# Docs generation with Doxygen
+	find_package( Doxygen )
+	if( DOXYGEN_FOUND )
+		add_custom_target (logog-doc ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doxyfile
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			COMMENT "Generating source code documentation with Doxygen." VERBATIM)
+	endif() # DOXYGEN_FOUND
+endif () # CMAKE_PROJECT_NAME = logog

Gui/DataExplorer.cmake

@@ -186,9 +186,9 @@ IF (OGS_PACKAGING)
 	INSTALL (TARGETS ogs-gui RUNTIME DESTINATION bin COMPONENT ogs_gui)
 
 	IF(MSVC)
-		SET(OGS_GUI_EXE ${OGS_EXECUTABLE}-gui.exe)
+		SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/Release/ogs-gui.exe)
 	ELSE(MSVC)
-		SET(OGS_GUI_EXE ${OGS_EXECUTABLE}-gui)
+		SET(OGS_GUI_EXE ${EXECUTABLE_OUTPUT_PATH}/ogs-gui)
 	ENDIF(MSVC)
 
 	INCLUDE(GetPrerequisites)

scripts/cmake/Pack.cmake

@@ -15,7 +15,6 @@ SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION_MAJOR}.${OGS_VERSION_MINOR}.${OGS
 IF (OGS_PACKAGING_ZIP)
   SET (CPACK_GENERATOR ZIP)
   SET(CPACK_PACKAGE_FILE_NAME "ogs-6")
-  MESSAGE (STATUS "Packaging set to ZIP")
 ELSE (OGS_PACKAGING_ZIP)
   IF(WIN32)
     SET(CPACK_GENERATOR NSIS)
@@ -33,11 +32,9 @@ ELSE (OGS_PACKAGING_ZIP)
   ELSE(WIN32)
     IF(UNIX)
       SET(CPACK_GENERATOR TGZ)
-      MESSAGE (STATUS "Packaging set to TGZ")
     ELSE(UNIX)
       IF(APPLE)
 		SET(CPACK_GENERATOR TGZ)
-	  	MESSAGE (STATUS "Packaging set to TGZ")
       ENDIF(APPLE)
     ENDIF(UNIX)
     #SET(CPACK_STRIP_FILES "bin/ogs")