Fix debug/release mismatch
Visual Studio doesn't like mixing debug and non-debug code.
This commit is contained in:
parent
70a67c51d2
commit
c2888302fd
|
@ -56,8 +56,8 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
|
|||
|
||||
# This "is a good thing" but greatly increases link time on Linux
|
||||
#set( CMAKE_INTERPROCEDURAL_OPTIMIZATION ON )
|
||||
#set( CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON )
|
||||
#set( CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF )
|
||||
#set( CMAKE_INTERPROCEDURAL_OPTIMIZATION_Debug OFF )
|
||||
|
||||
# Set the required C++ stardard
|
||||
set( CMAKE_CXX_STANDARD 14 )
|
||||
|
|
|
@ -119,12 +119,6 @@ function( addlib dir name symbol required check ) #packages )
|
|||
|
||||
# Set the folder (for the IDEs) for each one
|
||||
foreach( target ${targets} )
|
||||
# Add "global" defines
|
||||
set( DEFINES
|
||||
NDEBUG
|
||||
)
|
||||
target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
|
||||
|
||||
# Skip interface libraries since they don't have any source to
|
||||
# present in the IDEs
|
||||
get_target_property( type "${target}" TYPE )
|
||||
|
|
|
@ -28,7 +28,7 @@ if( wxWidgets_FOUND )
|
|||
set( DEFINES
|
||||
INTERFACE
|
||||
${wxWidgets_DEFINITIONS}
|
||||
${wxWidgets_DEFINITIONS_DEBUG}
|
||||
$<$<CONFIG:Debug>:${wxWidgets_DEFINITIONS_DEBUG}>
|
||||
)
|
||||
|
||||
set( LINKDIRS
|
||||
|
|
Loading…
Reference in New Issue