fix Windows and Linux builds of omcCAPI

Belonging to [master]:
  - #2136

Author: adrpo

SimulationRuntime/cpp/Makefile.in

@@ -33,7 +33,7 @@ CMAKE_ARGS=$(patsubst CMAKE_%, -D%, $(filter CMAKE_%, $(MAKEFLAGS)))
 
 CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_ROOT_COMMAND) $(BOOST_STATIC_LINKING_COMMAND) $(CPP_03_COMMAND) $(BOOST_REALPATHS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(SCOREP_COMMAND) $(FMU_SUNDIALS_COMMAND) $(LOGGER_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIBINSTALLEXT=$(LIBINSTALLEXT) -DSCOREP_HOME:STRING="$(SCOREP_HOME)" $(BUILD_DOC_COMMAND) $(CMAKE_ARGS) -DOpenMP_CXX_FLAGS="$(OMPCFLAGS)"
 
-runtimeCpp: # omcCAPIinstall
+runtimeCpp:
 	$(foreach PLATFORM, $(PLATFORMS), \
 	  mkdir -p Build_$(PLATFORM); \
 	  (cd ./Build_$(PLATFORM) && echo "change to Build_$(PLATFORM)" && $(CMAKE_COMMANDS) cmake -DPLATFORM=$(PLATFORM) $(CMAKE_FLAGS) ../); \
@@ -48,8 +48,6 @@ omcCAPIinstall:
 	(cd ./Build_CAPI; echo "change to Build_CAPI"; \
 	  $(CMAKE_COMMANDS) cmake -DPLATFORM=$(PLATFORM) -DOMC_PATH="$(OMBUILDDIR)" $(CMAKE_FLAGS) ../omcCAPI/; \
 	  $(MAKE) install;)
-	(cp -puf Build_CAPI/lib/* $(OMBUILDDIR)/lib/omc/)
-	(cp -puf Build_CAPI/lib/*.so $(OMBUILDDIR)/bin/)
 
 clean:
 	$(foreach PLATFORM, $(PLATFORMS), \

SimulationRuntime/cpp/omcCAPI/CMakeLists.txt

@@ -76,5 +76,5 @@ IF(ENABLE_CAPI_TESTS)
     TARGET_LINK_LIBRARIES(OMCExe ${OMCName}  ${Boost_LIBRARIES} )
     INSTALL(TARGETS OMCExe DESTINATION ./)
 ENDIF(ENABLE_CAPI_TESTS)
-INSTALL(TARGETS ${OMCName} DESTINATION ./)
+INSTALL(TARGETS ${OMCName} DESTINATION ${OMC_LIB_PATH})
 

SimulationRuntime/cpp/omcCAPI/src/OMC.cpp

@@ -61,7 +61,7 @@ extern "C" {
 		try
 		{
 			MMC_TRY_TOP_INTERNAL()
-				omcPtr->st = omc_OpenModelicaScriptingAPI_setCommandLineOptions(threadData, omcPtr->st, mmc_mk_scon(expression), &result);
+			result = omc_OpenModelicaScriptingAPI_setCommandLineOptions(threadData, mmc_mk_scon(expression));
 			MMC_CATCH_TOP()
 		}
 		catch (std::exception &exception)
@@ -80,9 +80,9 @@ extern "C" {
 		void *result_mm = NULL;
 		MMC_TRY_TOP_INTERNAL()
 			std::string name = "OpenModelica";
-		omcPtr->st = omc_OpenModelicaScriptingAPI_getVersion(threadData, omcPtr->st, mmc_mk_scon(name.c_str()), &result_mm);
+		result_mm = omc_OpenModelicaScriptingAPI_getVersion(threadData, mmc_mk_scon(name.c_str()));
 		MMC_CATCH_TOP()
-			*result = MMC_STRINGDATA(result_mm);
+		*result = MMC_STRINGDATA(result_mm);
 
 		return 1;
 	}
@@ -106,7 +106,7 @@ extern "C" {
 		try
 		{
 			MMC_TRY_TOP_INTERNAL()
-				omcPtr->st = omc_OpenModelicaScriptingAPI_loadModel(threadData, omcPtr->st, mmc_mk_scon(className), priorityVersion_lst, notify, mmc_mk_scon(languageStandard.c_str()), requireExactVersion, &result);
+				result = omc_OpenModelicaScriptingAPI_loadModel(threadData, mmc_mk_scon(className), priorityVersion_lst, notify, mmc_mk_scon(languageStandard.c_str()), requireExactVersion);
 			MMC_CATCH_TOP()
 		}
 		catch (std::exception &exception)
@@ -129,7 +129,7 @@ extern "C" {
 		try
 		{
 			MMC_TRY_TOP_INTERNAL()
-				omcPtr->st = omc_OpenModelicaScriptingAPI_loadFile(threadData, omcPtr->st, mmc_mk_scon(fileName), mmc_mk_scon(encoding.c_str()), uses, &result);
+				result = omc_OpenModelicaScriptingAPI_loadFile(threadData, mmc_mk_scon(fileName), mmc_mk_scon(encoding.c_str()), uses);
 			MMC_CATCH_TOP()
 		}
 		catch (std::exception &ex)
@@ -151,7 +151,7 @@ extern "C" {
 		try
 		{
 			MMC_TRY_TOP_INTERNAL()
-				omcPtr->st = omc_OpenModelicaScriptingAPI_getErrorString(threadData, omcPtr->st, warningsAsErrors, &result_mm);
+				result_mm = omc_OpenModelicaScriptingAPI_getErrorString(threadData, warningsAsErrors);
 			(*result) = MMC_STRINGDATA(result_mm);
 			MMC_CATCH_TOP()
 		}
@@ -169,7 +169,7 @@ extern "C" {
 		try
 		{
 			MMC_TRY_TOP_INTERNAL()
-				omcPtr->st = omc_OpenModelicaScriptingAPI_cd(threadData, omcPtr->st, mmc_mk_scon(directory), &reply_str);
+				reply_str = omc_OpenModelicaScriptingAPI_cd(threadData, mmc_mk_scon(directory));
 			(*result) = MMC_STRINGDATA(reply_str);
 			MMC_CATCH_TOP()
 		}