Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 9c4635f

Browse files
adrpoOpenModelica-Hudson
authored andcommitted
fix copy of the files and cmake search directories
Belonging to [master]: - #2137
1 parent ac51afc commit 9c4635f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

SimulationRuntime/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ MESSAGE(STATUS ${LAPACK_LIBRARIES})
510510
IF(REDUCE_DAE)
511511
ADD_DEFINITIONS("-DUSE_REDUCE_DAE")
512512
SET(OMCCAPI_INLCUDE_HOME omcCAPI/include/)
513-
SET(OMCCAPI_LIBRARY_RELEASE_HOME Build_CAPI/lib/)
513+
SET(OMCCAPI_LIBRARY_RELEASE_HOME Build_CAPI/)
514514
FIND_LIBRARY(OMCCAPI_LIB "OMCDLL" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${OMCCAPI_LIBRARY_RELEASE_HOME} )
515515
IF(NOT OMCCAPI_LIB)
516516
MESSAGE(FATAL_ERROR "Could not find omc c- api library!")

SimulationRuntime/cpp/Makefile.omdev.mingw

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ omcCAPIinstall:
235235
(cd ./Build_CAPI; echo "change to Build_CAPI"; \
236236
cmake -G "MSYS Makefiles" -DPLATFORM=$(PLATFORM) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DOMC_PATH="$(OMBUILDDIR)" -DCMAKE_INSTALL_PREFIX:PATH="./lib" MAKE_CXX_COMPILER=g++ ../omcCAPI/; \
237237
$(MAKE) install;)
238-
(cp -puf Build_CAPI/lib/* $(OMBUILDDIR)/lib/omc/)
239-
(cp -puf Build_CAPI/lib/*.dll $(OMBUILDDIR)/bin/)
238+
(cp -puf Build_CAPI/*.dll* $(OMBUILDDIR)/bin/)
239+
(cp -puf Build_CAPI/*.dll* $(OMBUILDDIR)/lib/omc/)
240240

241241
install: runtimeCpp
242242
$(foreach PLATFORM, $(PLATFORMS), \

0 commit comments

Comments
 (0)