Skip to content

Commit 55345df

Browse files
d-ledd-led
committed
fixed locally
1 parent c90b4fd commit 55345df

5 files changed

Lines changed: 38 additions & 13 deletions

File tree

‎examples/omnetpp_burst/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,27 @@ if(NOT OmnetPP_FOUND)
2727

2828
set(OMNETPP_ROOT $ENV{OMNETPP_ROOT})
2929
list(APPEND CMAKE_MODULE_PATH "${OMNETPP_ROOT}/misc/cmake")
30-
30+
3131
# Try again with the module path
3232
find_package(OmnetPP QUIET)
33-
33+
3434
if(NOT OmnetPP_FOUND)
3535
# Last resort: manual library finding
3636
set(OMNETPP_INCLUDE_DIRS ${OMNETPP_ROOT}/include)
3737
set(OMNETPP_LIB_DIR ${OMNETPP_ROOT}/lib)
3838

39+
# Find all required OMNeT++ libraries
40+
find_library(OMNETPP_MAIN_LIB oppmain PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
3941
find_library(OMNETPP_CMDENV_LIB oppcmdenv PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
42+
find_library(OMNETPP_ENVIR_LIB oppenvir PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4043
find_library(OMNETPP_SIM_LIB oppsim PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4144
find_library(OMNETPP_COMMON_LIB oppcommon PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4245

43-
# Libraries must be in this order: cmdenv provides main(), then sim, then common
46+
# Libraries must be in this order: main (contains main()), cmdenv, envir, sim, common
4447
set(OMNETPP_LIBRARIES
48+
${OMNETPP_MAIN_LIB}
4549
${OMNETPP_CMDENV_LIB}
50+
${OMNETPP_ENVIR_LIB}
4651
${OMNETPP_SIM_LIB}
4752
${OMNETPP_COMMON_LIB}
4853
dl

‎examples/omnetpp_loadbalanced/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,27 @@ if(NOT OmnetPP_FOUND)
2727

2828
set(OMNETPP_ROOT $ENV{OMNETPP_ROOT})
2929
list(APPEND CMAKE_MODULE_PATH "${OMNETPP_ROOT}/misc/cmake")
30-
30+
3131
# Try again with the module path
3232
find_package(OmnetPP QUIET)
33-
33+
3434
if(NOT OmnetPP_FOUND)
3535
# Last resort: manual library finding
3636
set(OMNETPP_INCLUDE_DIRS ${OMNETPP_ROOT}/include)
3737
set(OMNETPP_LIB_DIR ${OMNETPP_ROOT}/lib)
3838

39+
# Find all required OMNeT++ libraries
40+
find_library(OMNETPP_MAIN_LIB oppmain PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
3941
find_library(OMNETPP_CMDENV_LIB oppcmdenv PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
42+
find_library(OMNETPP_ENVIR_LIB oppenvir PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4043
find_library(OMNETPP_SIM_LIB oppsim PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4144
find_library(OMNETPP_COMMON_LIB oppcommon PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4245

43-
# Libraries must be in this order: cmdenv provides main(), then sim, then common
46+
# Libraries must be in this order: main (contains main()), cmdenv, envir, sim, common
4447
set(OMNETPP_LIBRARIES
48+
${OMNETPP_MAIN_LIB}
4549
${OMNETPP_CMDENV_LIB}
50+
${OMNETPP_ENVIR_LIB}
4651
${OMNETPP_SIM_LIB}
4752
${OMNETPP_COMMON_LIB}
4853
dl

‎examples/omnetpp_pipeline/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,27 @@ if(NOT OmnetPP_FOUND)
2727

2828
set(OMNETPP_ROOT $ENV{OMNETPP_ROOT})
2929
list(APPEND CMAKE_MODULE_PATH "${OMNETPP_ROOT}/misc/cmake")
30-
30+
3131
# Try again with the module path
3232
find_package(OmnetPP QUIET)
33-
33+
3434
if(NOT OmnetPP_FOUND)
3535
# Last resort: manual library finding
3636
set(OMNETPP_INCLUDE_DIRS ${OMNETPP_ROOT}/include)
3737
set(OMNETPP_LIB_DIR ${OMNETPP_ROOT}/lib)
3838

39+
# Find all required OMNeT++ libraries
40+
find_library(OMNETPP_MAIN_LIB oppmain PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
3941
find_library(OMNETPP_CMDENV_LIB oppcmdenv PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
42+
find_library(OMNETPP_ENVIR_LIB oppenvir PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4043
find_library(OMNETPP_SIM_LIB oppsim PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4144
find_library(OMNETPP_COMMON_LIB oppcommon PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4245

43-
# Libraries must be in this order: cmdenv provides main(), then sim, then common
46+
# Libraries must be in this order: main (contains main()), cmdenv, envir, sim, common
4447
set(OMNETPP_LIBRARIES
48+
${OMNETPP_MAIN_LIB}
4549
${OMNETPP_CMDENV_LIB}
50+
${OMNETPP_ENVIR_LIB}
4651
${OMNETPP_SIM_LIB}
4752
${OMNETPP_COMMON_LIB}
4853
dl

‎examples/omnetpp_pubsub/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,27 @@ if(NOT OmnetPP_FOUND)
2727

2828
set(OMNETPP_ROOT $ENV{OMNETPP_ROOT})
2929
list(APPEND CMAKE_MODULE_PATH "${OMNETPP_ROOT}/misc/cmake")
30-
30+
3131
# Try again with the module path
3232
find_package(OmnetPP QUIET)
33-
33+
3434
if(NOT OmnetPP_FOUND)
3535
# Last resort: manual library finding
3636
set(OMNETPP_INCLUDE_DIRS ${OMNETPP_ROOT}/include)
3737
set(OMNETPP_LIB_DIR ${OMNETPP_ROOT}/lib)
3838

39+
# Find all required OMNeT++ libraries
40+
find_library(OMNETPP_MAIN_LIB oppmain PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
3941
find_library(OMNETPP_CMDENV_LIB oppcmdenv PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
42+
find_library(OMNETPP_ENVIR_LIB oppenvir PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4043
find_library(OMNETPP_SIM_LIB oppsim PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4144
find_library(OMNETPP_COMMON_LIB oppcommon PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
4245

43-
# Libraries must be in this order: cmdenv provides main(), then sim, then common
46+
# Libraries must be in this order: main (contains main()), cmdenv, envir, sim, common
4447
set(OMNETPP_LIBRARIES
48+
${OMNETPP_MAIN_LIB}
4549
${OMNETPP_CMDENV_LIB}
50+
${OMNETPP_ENVIR_LIB}
4651
${OMNETPP_SIM_LIB}
4752
${OMNETPP_COMMON_LIB}
4853
dl

‎lib/actor_simulation/omnetpp_generator.ex‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,18 @@ defmodule ActorSimulation.OMNeTPPGenerator do
400400
set(OMNETPP_INCLUDE_DIRS ${OMNETPP_ROOT}/include)
401401
set(OMNETPP_LIB_DIR ${OMNETPP_ROOT}/lib)
402402
403+
# Find all required OMNeT++ libraries
404+
find_library(OMNETPP_MAIN_LIB oppmain PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
403405
find_library(OMNETPP_CMDENV_LIB oppcmdenv PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
406+
find_library(OMNETPP_ENVIR_LIB oppenvir PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
404407
find_library(OMNETPP_SIM_LIB oppsim PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
405408
find_library(OMNETPP_COMMON_LIB oppcommon PATHS ${OMNETPP_LIB_DIR} REQUIRED NO_DEFAULT_PATH)
406409
407-
# Libraries must be in this order: cmdenv provides main(), then sim, then common
410+
# Libraries must be in this order: main (contains main()), cmdenv, envir, sim, common
408411
set(OMNETPP_LIBRARIES
412+
${OMNETPP_MAIN_LIB}
409413
${OMNETPP_CMDENV_LIB}
414+
${OMNETPP_ENVIR_LIB}
410415
${OMNETPP_SIM_LIB}
411416
${OMNETPP_COMMON_LIB}
412417
dl

0 commit comments

Comments
 (0)