+ use nodefaultlib linker flag for modules
This commit is contained in:
wmayer
parent
d95003e92c
commit
51f0e99d7b
|
|
@ -797,7 +797,8 @@ IF(MSVC)
|
|||
set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
|
||||
# set linker flag /nodefaultlib
|
||||
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB")
|
||||
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
|
||||
set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /NODEFAULTLIB")
|
||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
|
||||
IF(FREECAD_RELEASE_PDB)
|
||||
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
|
||||
set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ set(Boost_LIBRARIES
|
|||
optimized boost_system-vc110-mt-1_55.lib
|
||||
optimized boost_graph-vc110-mt-1_55.lib
|
||||
optimized boost_program_options-vc110-mt-1_55.lib
|
||||
optimized boost_python-vc110-mt-1_55.lib
|
||||
optimized boost_regex-vc110-mt-1_55.lib
|
||||
optimized boost_signals-vc110-mt-1_55.lib
|
||||
optimized boost_thread-vc110-mt-1_55.lib
|
||||
|
|
@ -37,6 +38,7 @@ set(Boost_LIBRARIES
|
|||
debug boost_system-vc110-mt-gd-1_55.lib
|
||||
debug boost_graph-vc110-mt-gd-1_55.lib
|
||||
debug boost_program_options-vc110-mt-gd-1_55.lib
|
||||
debug boost_python-vc110-mt-gd-1_55.lib
|
||||
debug boost_regex-vc110-mt-gd-1_55.lib
|
||||
debug boost_signals-vc110-mt-gd-1_55.lib
|
||||
debug boost_thread-vc110-mt-gd-1_55.lib
|
||||
|
|
|
|||
|
|
@ -29,11 +29,13 @@ set(Boost_LIBRARIES
|
|||
optimized boost_filesystem-vc80-mt.lib
|
||||
#optimized boost_graph-vc80-mt.lib
|
||||
optimized boost_program_options-vc80-mt.lib
|
||||
optimized boost_python-vc80-mt.lib
|
||||
optimized boost_regex-vc80-mt.lib
|
||||
optimized boost_signals-vc80-mt.lib
|
||||
debug boost_filesystem-vc80-mt-gd.lib
|
||||
#debug boost_graph-vc80-mt-gd.lib
|
||||
debug boost_program_options-vc80-mt-gd.lib
|
||||
debug boost_python-vc80-mt-gd.lib
|
||||
debug boost_regex-vc80-mt-gd.lib
|
||||
debug boost_signals-vc80-mt-gd.lib
|
||||
)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ set(Boost_LIBRARIES
|
|||
optimized boost_system-vc90-mt-1_39.lib
|
||||
optimized boost_graph-vc90-mt-1_39.lib
|
||||
optimized boost_program_options-vc90-mt-1_39.lib
|
||||
optimized boost_python-vc90-mt-1_39.lib
|
||||
optimized boost_regex-vc90-mt-1_39.lib
|
||||
optimized boost_signals-vc90-mt-1_39.lib
|
||||
optimized boost_thread-vc90-mt-1_39.lib
|
||||
|
|
@ -43,6 +44,7 @@ set(Boost_LIBRARIES
|
|||
debug boost_system-vc90-mt-gd-1_39.lib
|
||||
debug boost_graph-vc90-mt-gd-1_39.lib
|
||||
debug boost_program_options-vc90-mt-gd-1_39.lib
|
||||
debug boost_python-vc90-mt-gd-1_39.lib
|
||||
debug boost_regex-vc90-mt-gd-1_39.lib
|
||||
debug boost_signals-vc90-mt-gd-1_39.lib
|
||||
)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ set(Boost_LIBRARIES
|
|||
optimized boost_system-vc90-mt-1_48.lib
|
||||
optimized boost_graph-vc90-mt-1_48.lib
|
||||
optimized boost_program_options-vc90-mt-1_48.lib
|
||||
optimized boost_python-vc90-mt-1_48.lib
|
||||
optimized boost_regex-vc90-mt-1_48.lib
|
||||
optimized boost_signals-vc90-mt-1_48.lib
|
||||
optimized boost_thread-vc90-mt-1_48.lib
|
||||
|
|
@ -43,6 +44,7 @@ set(Boost_LIBRARIES
|
|||
debug boost_system-vc90-mt-gd-1_48.lib
|
||||
debug boost_graph-vc90-mt-gd-1_48.lib
|
||||
debug boost_program_options-vc90-mt-gd-1_48.lib
|
||||
debug boost_python-vc90-mt-gd-1_48.lib
|
||||
debug boost_regex-vc90-mt-gd-1_48.lib
|
||||
debug boost_signals-vc90-mt-gd-1_48.lib
|
||||
)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ set(Boost_LIBRARIES
|
|||
optimized boost_system-vc90-mt-1_54.lib
|
||||
optimized boost_graph-vc90-mt-1_54.lib
|
||||
optimized boost_program_options-vc90-mt-1_54.lib
|
||||
optimized boost_python-vc90-mt-1_54.lib
|
||||
optimized boost_regex-vc90-mt-1_54.lib
|
||||
optimized boost_signals-vc90-mt-1_54.lib
|
||||
optimized boost_thread-vc90-mt-1_54.lib
|
||||
|
|
@ -37,6 +38,7 @@ set(Boost_LIBRARIES
|
|||
debug boost_system-vc90-mt-gd-1_54.lib
|
||||
debug boost_graph-vc90-mt-gd-1_54.lib
|
||||
debug boost_program_options-vc90-mt-gd-1_54.lib
|
||||
debug boost_python-vc90-mt-gd-1_54.lib
|
||||
debug boost_regex-vc90-mt-gd-1_54.lib
|
||||
debug boost_signals-vc90-mt-gd-1_54.lib
|
||||
debug boost_thread-vc90-mt-gd-1_54.lib
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ set(Boost_LIBRARIES
|
|||
optimized boost_system-vc90-mt-1_41.lib
|
||||
optimized boost_graph-vc90-mt-1_41.lib
|
||||
optimized boost_program_options-vc90-mt-1_41.lib
|
||||
optimized boost_python-vc90-mt-1_41.lib
|
||||
optimized boost_regex-vc90-mt-1_41.lib
|
||||
optimized boost_signals-vc90-mt-1_41.lib
|
||||
optimized boost_thread-vc90-mt-1_41.lib
|
||||
|
|
@ -37,6 +38,7 @@ set(Boost_LIBRARIES
|
|||
debug boost_system-vc90-mt-gd-1_41.lib
|
||||
debug boost_graph-vc90-mt-gd-1_41.lib
|
||||
debug boost_program_options-vc90-mt-gd-1_41.lib
|
||||
debug boost_python-vc90-mt-gd-1_41.lib
|
||||
debug boost_regex-vc90-mt-gd-1_41.lib
|
||||
debug boost_signals-vc90-mt-gd-1_41.lib
|
||||
debug boost_thread-vc90-mt-gd-1_41.lib
|
||||
|
|
|
|||
|
|
@ -66,7 +66,29 @@ add_library(
|
|||
${PYAREA_SRC}
|
||||
)
|
||||
|
||||
target_link_libraries(area ${Boost_LIBRARIES})
|
||||
if(MSVC)
|
||||
set(area_LIBS
|
||||
${Boost_LIBRARIES}
|
||||
${PYTHON_LIBRARIES}
|
||||
debug MSVCRTD.LIB
|
||||
debug MSVCPRTD.LIB
|
||||
optimized MSVCRT.LIB
|
||||
optimized MSVCPRT.LIB
|
||||
)
|
||||
elseif(MINGW)
|
||||
set(area_LIBS
|
||||
${Boost_LIBRARIES}
|
||||
${PYTHON_LIBRARIES}
|
||||
Rpcrt4.lib
|
||||
)
|
||||
else(MSVC)
|
||||
set(area_LIBS
|
||||
${Boost_LIBRARIES}
|
||||
${PYTHON_LIBRARIES}
|
||||
)
|
||||
endif(MSVC)
|
||||
|
||||
target_link_libraries(area ${area_LIBS})
|
||||
|
||||
SET_BIN_DIR(area area)
|
||||
SET_PYTHON_PREFIX_SUFFIX(area)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user