Merge branch 'master' of https://github.com/OpenModelica/OMCompiler

OpenModelica · Aug 10, 2015 · 74d4e2f · 74d4e2f
2 parents c34f65c + 28f13ed
commit 74d4e2f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2,475 deletions.
diff --git a/Compiler/Template/CodegenFMUCpp.tpl b/Compiler/Template/CodegenFMUCpp.tpl
@@ -759,16 +759,20 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   <%\t%>rm -rf binaries
   <%\t%><%mkdir%> -p "binaries/$(PLATFORM)"
   <%\t%>cp <%fileNamePrefix%>$(DLLEXT) "binaries/$(PLATFORM)/"
-  <%\t%>rm -f <%modelName%>.fmu
-  <%\t%>zip -r "<%modelName%>.fmu" modelDescription.xml binaries
-  <%\t%>rm -rf binaries
   ifeq ($(USE_FMU_KINSOL),ON)
   <%\t%>rm -rf documentation
   <%\t%><%mkdir%> -p "documentation"
   <%\t%>cp $(SUNDIALS_LIBRARIES_KINSOL) "binaries/$(PLATFORM)/"
   <%\t%>cp $(OMHOME)/share/omc/runtime/cpp/licenses/sundials.license "documentation/"
+  endif
+  <%\t%>rm -f <%modelName%>.fmu
+  ifeq ($(USE_FMU_KINSOL),ON)
+  <%\t%>zip -r "<%modelName%>.fmu" modelDescription.xml binaries documentation
   <%\t%>rm -rf documentation
+  else
+  <%\t%>zip -r "<%modelName%>.fmu" modelDescription.xml binaries
   endif
+  <%\t%>rm -rf binaries
 
   clean:
   <%\t%>rm $(SRC) <%fileNamePrefix%>$(DLLEXT)

diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -40,7 +40,6 @@ OPTION(RUNTIME_PROFILING "RUNTIME_PROFILING" OFF)
 OPTION(FMU_KINSOL "FMU_KINSOL" OFF)
 OPTION(SUNDIALS_LAPACK "SUNDIALS_LAPACK" OFF)
 OPTION(SUNDIALS_ROOT "SUNDIALS ROOT" "")
-OPTION(BUILD_DOCUMENTATION "Use Doxygen to create the cpp runtime documentation" OFF)
 
 #Set Variables
 SET(MODELICAEXTERNALCDIR  "${CMAKE_SOURCE_DIR}/../../3rdParty/ModelicaExternalC/C-Sources")
@@ -392,29 +391,6 @@ IF(USE_SUNDIALS)
   ENDIF(WIN32)
 ENDIF(USE_SUNDIALS)
 
-#-- generate documentation of cpp runtime with doxygen
-if(BUILD_DOCUMENTATION)
-  FIND_PACKAGE(Doxygen)
-  if (NOT DOXYGEN_FOUND)
-    message(FATAL_ERROR
-      "Doxygen is needed to build the documentation. Please install it correctly")
-  endif()
-   MESSAGE(STATUS "Build the documentation with Doxygen")
-  #-- Configure the Template Doxyfile for our specific project
-  configure_file(cppruntimedoc.config.in
-                 ${PROJECT_BINARY_DIR}/cppruntimedoc.config  @ONLY IMMEDIATE)
-  #-- Add a custom target to run Doxygen when ever the project is built
-  add_custom_target (Docs ALL
-                     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cppruntimedoc.config
-                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMENT "Generating API documentation with Doxygen" VERBATIM
-                    )
-  # IF you do NOT want the documentation to be generated EVERY time you build the project
-  # then leave out the 'ALL' keyword from the above command.
-endif()
-
-
-
 #Handle umfpack
 FIND_PACKAGE(SuiteSparse)
 IF(SUITESPARSE_UMFPACK_FOUND)

diff --git a/SimulationRuntime/cpp/Makefile.omdev.mingw b/SimulationRuntime/cpp/Makefile.omdev.mingw
@@ -16,19 +16,12 @@ BUILDTYPE = Debug
 CMAKE = $(OMDEV)/bin/cmake/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON
 
 runtimeCpp:
-ifeq ("$(BUILD_DOCUMENTATION)","true")
-	cd ./Build; echo "change to Build";	\
-	$(CMAKE) -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=$(BUILDTYPE) -DBUILD_DOCUMENTATION=ON -D CMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
-	make;
-else
 	mkdir -p Build
 	cd ./Build; echo "change to Build";	\
 	$(CMAKE) -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=$(BUILDTYPE) -D CMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
 	make;
-endif
 
 runtimeCPPmsvc:
-
 	test -f """${VS100COMNTOOLS}/../../VC/vcvarsall.bat"""
 	echo 'Build the cppRuntime with MSVC'
 	#rm -rf build_msvc