Skip to content

Commit 2bac6ef

Browse files
committed
fix case in CMakeLists.txt and ModelicaExternalC dependency
1 parent 5a5b63c commit 2bac6ef

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

OMCompiler/Makefile.common

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,19 +220,19 @@ breakprocess:
220220
(cd tools/debugging/ && time g++ BreakProcess.cpp -o BreakProcess -static-libgcc)
221221
(cd tools/debugging/ && cp BreakProcess.exe $(builddir_bin))
222222

223-
all-runtimeCPPinstall: CMinpack sundials
223+
all-runtimeCPPinstall: CMinpack sundials ModelicaExternalC
224224
$(MAKE) all runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)
225225

226-
omc-and-runtimeCPPinstall: CMinpack sundials
226+
omc-and-runtimeCPPinstall: CMinpack sundials ModelicaExternalC
227227
$(MAKE) omc runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)
228228

229-
runtimeCPP: CMinpack sundials antlr-copy $(MINGW_EXTRA_LIBS) omc
229+
runtimeCPP: CMinpack sundials antlr-copy $(MINGW_EXTRA_LIBS) omc ModelicaExternalC
230230
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)
231231

232232
CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
233233

234234

235-
omcCAPIinstall:
235+
omcCAPIinstall: ModelicaExternalC
236236
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) omcCAPIinstall CC="$(CC)" CXX="$(CXX)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR)
237237

238238
runtimeCPPinstall: runtimeCPP

OMCompiler/SimulationRuntime/cpp/omcWrapper/CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ INCLUDE(../CMake/CheckCXX11.cmake)
2626
ELSE(MSVC)
2727
SET(ZeroMQ_DIR "${CMAKE_SOURCE_DIR}/../../../3rdParty/libzmq/build/share/cmake/ZeroMQ")
2828
SET(cppzmq_DIR "${CMAKE_SOURCE_DIR}/../../../3rdParty/cppzmq/build/share/cmake/cppzmq")
29-
ENDIF(MSVC)
30-
31-
32-
find_package(ZeroMQ )
33-
find_package(cppzmq )
29+
ENDIF(MSVC)
30+
31+
32+
find_package(ZeroMQ )
33+
find_package(cppzmq )
3434

3535

3636

@@ -43,14 +43,14 @@ IF(ZeroMQ_FOUND AND cppzmq_FOUND)
4343
set(ZeroMQ_LIB ${ZeroMQ_LIBRARY})
4444
ENDIF((MSVC) AND (CMAKE_BUILD_TYPE MATCHES Debug))
4545

46-
message (STATUS "Using ZMQ library ${ZeroMQ_LIBRARY} ${ZeroMQ_LIB} " )
47-
message(STATUS "cppzmq version ${cppzmq_VERSION}")
48-
message (STATUS "Using ZMQ Header ${ZeroMQ_INCLUDE_DIR}" )
49-
message (STATUS "Using CPPZMQ Header ${cppzmq_INCLUDE_DIR}" )
50-
ELSE(ZeroMQ_found AND cppzmq_found)
46+
message (STATUS "Using ZMQ library ${ZeroMQ_LIBRARY} ${ZeroMQ_LIB} " )
47+
message(STATUS "cppzmq version ${cppzmq_VERSION}")
48+
message (STATUS "Using ZMQ Header ${ZeroMQ_INCLUDE_DIR}" )
49+
message (STATUS "Using CPPZMQ Header ${cppzmq_INCLUDE_DIR}" )
50+
ELSE(ZeroMQ_FOUND AND cppzmq_FOUND)
5151
SET(USE_ZEROMQ OFF)
5252
message (STATUS "zeromq was not found " )
53-
ENDIF(ZeroMQ_found AND cppzmq_found)
53+
ENDIF(ZeroMQ_FOUND AND cppzmq_FOUND)
5454

5555

5656
#omc c-api library build is only supported for mingw on Windows.
@@ -77,8 +77,8 @@ if(USE_ZEROMQ AND COMPILER_SUPPORTS_CXX11 AND (NOT ((${CMAKE_SYSTEM_NAME} MATCHE
7777
add_subdirectory(omcZeroMQ)
7878
endif(USE_ZEROMQ AND COMPILER_SUPPORTS_CXX11 AND (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") )))
7979

80-
81-
82-
80+
81+
82+
8383

8484

0 commit comments

Comments
 (0)