From 64a6fffdbcade2a93e704f3a60cf95514f58e70d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 12 Oct 2014 22:28:39 +0000 Subject: [PATCH] [CMAKE] * Module type win32dll ENTRYPOINT 0 => module. svn path=/trunk/; revision=64703 --- rostests/tests/dllexport/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rostests/tests/dllexport/CMakeLists.txt b/rostests/tests/dllexport/CMakeLists.txt index fe24312f7ca..47ca9b053ac 100644 --- a/rostests/tests/dllexport/CMakeLists.txt +++ b/rostests/tests/dllexport/CMakeLists.txt @@ -6,14 +6,14 @@ set(baseaddress_dllexport_test_dll1 0x1000000) add_library(dllexport_test_dll1 SHARED dllexport_test_dll1.c ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def) -set_module_type(dllexport_test_dll1 win32dll ENTRYPOINT 0) +set_module_type(dllexport_test_dll1 module) add_importlibs(dllexport_test_dll1 dllexport_test_dll2) set(baseaddress_dllexport_test_dll2 0x2000000) add_library(dllexport_test_dll2 SHARED dllexport_test_dll2.c ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def) -set_module_type(dllexport_test_dll2 win32dll ENTRYPOINT 0) +set_module_type(dllexport_test_dll2 module) add_executable(dllexport_test dllexport_test.c) @@ -27,7 +27,7 @@ endif() add_library(dllimport_test SHARED dllimport_framedyn.cpp) -set_module_type(dllimport_test win32dll ENTRYPOINT 0) +set_module_type(dllimport_test module) add_importlibs(dllimport_test framedyn) if(NOT MSVC) target_link_libraries(dllimport_test framedynex)