Skip to content

Commit 7fdfdab

Browse files
author
Jens Frenkel
committed
- CMakeFiles work with VisualStudio but generated omc.exe wound work because of qt problems
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5231 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 7d31d76 commit 7fdfdab

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Compiler/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,6 @@ link_directories($ENV{OMDEV}/lib/antlr-win32-msvc $ENV{OMDEV}/lib/mico-win32-msv
144144
#add_definitions(/Ob2 /Ox /O2 /Ot /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_WARNINGS" /D "_MBCS" /FD /EHsc /MT /W3 /nologo /c /TC /wd4311 /wd4312)
145145
add_definitions(/MT)
146146
ADD_EXECUTABLE(omc ${MOCH_FILES})
147-
TARGET_LINK_LIBRARIES(omc absyn_builder libmodpar mico2313 sendData c_runtime librml wsock32 shlwapi)
147+
TARGET_LINK_LIBRARIES(omc absyn_builder libmodpar mico2313 sendData c_runtime wsock32 shlwapi )
148+
TARGET_LINK_LIBRARIES(omc -FORCE:MULTIPLE librml)
148149
add_dependencies(omc ${MOCH_ALL})

Compiler/absyn_builder/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SET(DEP walker.g)
5959
# custom command for ar
6060
ADD_CUSTOM_COMMAND(OUTPUT ${ANTLR_OUTPUT}
6161
COMMAND ${ANTLR} ${ANTLRFLAGS} ${ANTLR_DEP}
62-
DEPENDS ${MPTT_OUTPUT} ${ANTLR_DEP} MPTT_cp ${MOCH_ALL}
62+
DEPENDS MPTT_cp ${ANTLR_DEP} ${MOCH_ALL}
6363
WORKING_DIRECTORY ${CODEGENDIR}/absyn_builder
6464
COMMENT "Generate antlr from ${DEP}")
6565

@@ -91,7 +91,7 @@ SET(WDEP expression_parser.g)
9191
# custom command for ar
9292
ADD_CUSTOM_COMMAND(OUTPUT ${EP_OUTPUT}
9393
COMMAND ${CMAKE_COMMAND} -E copy ${ANTLR_WDEP} ${EP_OUTPUT}
94-
DEPENDS ${MOCH_ALL}
94+
DEPENDS MPTT_cp ${MOCH_ALL}
9595
WORKING_DIRECTORY ${CODEGENDIR}/absyn_builder
9696
COMMENT "copy ${ANTLR_WDEP} to ${EP_OUTPUT}")
9797

0 commit comments

Comments
 (0)