Skip to content

Commit 4a15828

Browse files
committed
another try on the build #3
1 parent b94b708 commit 4a15828

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(sumoguilibs
1717
guinetload guisim gui gui_dialogs utils_gui_windows utils_gui_globjects
1818
utils_gui_div utils_gui_settings utils_gui_images utils_gui_cursors
1919
utils_gui_shortcuts utils_tests utils_gui_tracker utils_foxtools
20-
${osgviewlib} ${sumolibs} mesogui libsumoguistatic
20+
${osgviewlib} ${sumolibs} mesogui
2121
${GDAL_LIBRARY} ${FFMPEG_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES} ${GL2PS_LIBRARIES})
2222
if (MSVC)
2323
set(sumoguilibs ${sumoguilibs} opengl32 glu32)
@@ -74,7 +74,7 @@ if (FOX_FOUND)
7474
add_executable(sumo-gui guisim_main.cpp sumo-gui.rc)
7575
set_target_properties(sumo-gui PROPERTIES OUTPUT_NAME sumo-gui${BINARY_SUFFIX})
7676
set_target_properties(sumo-gui PROPERTIES OUTPUT_NAME_DEBUG sumo-gui${BINARY_SUFFIX}D)
77-
target_link_libraries(sumo-gui ${sumoguilibs} ${TCMALLOC_LIBRARY})
77+
target_link_libraries(sumo-gui ${sumoguilibs} libsumoguistatic ${TCMALLOC_LIBRARY})
7878
if (MSVC)
7979
if (CONSOLE_RELEASE)
8080
set_target_properties(sumo-gui PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:mainCRTStartup")

src/libsumo/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,18 @@ if (FOX_FOUND)
7777
# for libsumocpp we need to recompile a third time to make sure everything is in the public interface
7878
add_library(libsumocpp SHARED ${libsumostatic_STAT_SRCS} GUI.cpp GUI.h)
7979
target_compile_definitions(libsumocpp PUBLIC HAVE_LIBSUMOGUI)
80-
set(sumo_link_libraries ${sumoguilibs})
80+
set(sumo_link_libraries ${sumoguilibs} libsumoguistatic)
81+
target_link_libraries(libsumocpp PRIVATE ${sumoguilibs})
8182
else ()
8283
add_library(libsumocpp SHARED ${libsumostatic_STAT_SRCS})
8384
if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
8485
set(sumo_link_libraries -Wl,--whole-archive libsumostatic ${sumolibs} -Wl,--no-whole-archive)
8586
else ()
8687
set(sumo_link_libraries libsumostatic ${sumolibs})
8788
endif()
89+
target_link_libraries(libsumocpp PRIVATE ${sumolibs})
8890
endif()
8991
# TODO libsumocpp may contain GUI or not, you cannot tell from the name
90-
target_link_libraries(libsumocpp PRIVATE ${sumo_link_libraries})
9192
add_dependencies(libsumocpp generate-version-h install_dll)
9293

9394
set_target_properties(libsumocpp PROPERTIES FOLDER "libsumo" PREFIX ""

src/traci_testclient/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set_target_properties(testlibsumostatic PROPERTIES OUTPUT_NAME testlibsumostatic
2424
set_target_properties(testlibsumostatic PROPERTIES OUTPUT_NAME_DEBUG testlibsumostatic${BINARY_SUFFIX}D)
2525
set_property(TARGET testlibsumostatic PROPERTY FOLDER "test_exe")
2626
if (FOX_FOUND)
27-
target_link_libraries(testlibsumostatic ${sumoguilibs})
27+
target_link_libraries(testlibsumostatic ${sumoguilibs} libsumoguistatic)
2828
else ()
2929
if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
3030
target_link_libraries(testlibsumostatic -Wl,--whole-archive libsumostatic ${sumolibs} -Wl,--no-whole-archive)

0 commit comments

Comments
 (0)