- update CMake Files, now only the linker fails because of

runtime.lib(systemimpl.obj) : error LNK2005: _rml_user_gc ist bereits in librml.lib(p-usergc.obj) definiert. >msvcprt.lib, MSVCRT.lib, error LNK2005: __errno ist bereits in LIBCMT.lib(dosmap.obj) definiert. ... git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5224 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 26, 2010 · 24b928b · 24b928b
1 parent 233041f
commit 24b928b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/Compiler/CMakeLists.txt b/Compiler/CMakeLists.txt
@@ -138,10 +138,10 @@ ADD_SUBDIRECTORY(modpar)
 INCLUDE_DIRECTORIES($ENV{OMDEV}/tools/rml/include/plain)
 INCLUDE_DIRECTORIES(${CODEGENDIR})
 
-
 # omc program
-link_directories($ENV{OMDEV}/lib/antlr-win32-msvc $ENV{OMDEV}/lib/mico-win32-msvc ${OMCTRUNCHOME}/Compiler/runtime/lpsolve/lib/win32)
+link_directories($ENV{OMDEV}/lib/antlr-win32-msvc $ENV{OMDEV}/lib/mico-win32-msvc ${OMCTRUNCHOME}/Compiler/runtime/lpsolve/lib/win32 $ENV{OMDEV}/tools/rml/lib/plain)
+
+add_definitions(/MT)
 ADD_EXECUTABLE(omc ${MOCH_FILES})
-TARGET_LINK_LIBRARIES(omc absyn_builder libflat_modelica_parser libmodpar mico2313 wsock32  sendData shlwapi runtime c_runtime)
-#psolve55
+TARGET_LINK_LIBRARIES(omc absyn_builder libmodpar mico2313 sendData c_runtime librml wsock32 shlwapi)
 add_dependencies(omc ${MOCH_ALL})
diff --git a/Compiler/absyn_builder/CMakeLists.txt b/Compiler/absyn_builder/CMakeLists.txt
@@ -120,5 +120,6 @@ ELSE(WIN32)
   SET(ANTLR_LIB libantlr)
 ENDIF(WIN32)
 link_directories($ENV{OMDEV}/lib/antlr-win32-msvc)
+add_definitions(/MT)
 ADD_LIBRARY(absyn_builder ${OBJS})
-TARGET_LINK_LIBRARIES(absyn_builder antlr libmodelica_parser libflat_modelica_parser)
+TARGET_LINK_LIBRARIES(absyn_builder antlr libmodelica_parser libflat_modelica_parser runtime)
diff --git a/Compiler/modpar/CMakeLists.txt b/Compiler/modpar/CMakeLists.txt
@@ -19,5 +19,6 @@ ELSE(USE_MODPAR)
   SET(OBJECTS  TaskGraphExt_stub.cpp)
 ENDIF(USE_MODPAR)
 
+add_definitions(/MT)
 ADD_LIBRARY(libmodpar ${OBJECTS})
 
diff --git a/Compiler/runtime/CMakeLists.txt b/Compiler/runtime/CMakeLists.txt
@@ -8,8 +8,10 @@ IF(NOT IDL)
 ENDIF(NOT IDL)
 
 INCLUDE_DIRECTORIES($ENV{OMDEV}/tools/rml/include/plain)
+INCLUDE_DIRECTORIES(${CODEGENDIR})
 INCLUDE_DIRECTORIES(${CODEGENDIR}/absyn_builder)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lpsolve)
 
 # custom command for idl
 SET(IDL_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/omc_communication.cc ${CMAKE_CURRENT_BINARY_DIR}/omc_communication.h)
@@ -29,5 +31,7 @@ SET(CPPSRC  unitparser.cpp unitparserext.cpp ptolemyio.cpp daeext.cpp ErrorMessa
 SET(OBJ ${SRC} ${CPPSRC})
 
 # Bibliothek
-ADD_LIBRARY(runtime ${CORBASRC} ${c_runtime_headers})
-#TARGET_LINK_LIBRARIES(c_runtime f2c)
+link_directories(${OMCTRUNCHOME}/Compiler/runtime/lpsolve/lib/win32)
+add_definitions(/MT)
+ADD_LIBRARY(runtime ${OBJ})
+TARGET_LINK_LIBRARIES(runtime lpsolve55)
diff --git a/flat_modelica_parser/src/CMakeLists.txt b/flat_modelica_parser/src/CMakeLists.txt
@@ -97,6 +97,7 @@ ELSE(WIN32)
   SET(ANTLR_LIB libantlr)
 ENDIF(WIN32)
 link_directories($ENV{OMDEV}/lib/antlr-win32-msvc)
+add_definitions(/MT)
 ADD_LIBRARY(libflat_modelica_parser ${OBJS})
 TARGET_LINK_LIBRARIES(libflat_modelica_parser antlr)
 

diff --git a/modelica_parser/src/CMakeLists.txt b/modelica_parser/src/CMakeLists.txt
@@ -94,6 +94,7 @@ ELSE(WIN32)
   SET(ANTLR_LIB libantlr)
 ENDIF(WIN32)
 link_directories($ENV{OMDEV}/lib/antlr-win32-msvc)
+add_definitions(/MT)
 ADD_LIBRARY(libmodelica_parser ${OBJS})
 TARGET_LINK_LIBRARIES(libmodelica_parser antlr)