Skip to content

Commit

Permalink
- moved creation of build-folder from clean- to runtimeCPP-target
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcus Walther authored and OpenModelica-Hudson committed Jun 11, 2015
1 parent c04586e commit b913ad9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Makefile.in
Expand Up @@ -47,6 +47,7 @@ endif
ifneq ("$(USE_SUNDIALS_LAPACK)","true")
$(eval SUNDIALS_LAPACK_COMMAND=)
endif
mkdir -p Build
cd ./Build && echo "change to Build" && $(CMAKE_COMMANDS) cmake $(RUNTIME_STATIC_LINKING_COMMAND) $(BOOST_STATIC_LINKING_COMMAND) $(BOOST_REALPATHS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(SCOREP_COMMAND) $(SUNDIALS_LAPACK_COMMAND) -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIBINSTALLEXT=lib/@host_short@/omc/cpp $(CMAKE_ARGS) ../
$(MAKE) -C Build VERBOSE=1

Expand All @@ -55,7 +56,6 @@ install: runtimeCpp

clean:
rm -R -f Build
mkdir Build

Makefile: Makefile.in
cd @top_builddir@ && ./config.status
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Makefile.omdev.mingw
Expand Up @@ -25,6 +25,7 @@ else ifeq ("$(BUILD_DOCUMENTATION)","true")
$(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;
Expand Down Expand Up @@ -84,4 +85,3 @@ install: runtimeCpp

clean:
rm -R -f Build
mkdir Build

0 comments on commit b913ad9

Please sign in to comment.