Skip to content

GitLab

Commit dd0f2577 authored by Jesse Beder's avatar Jesse Beder
Browse files

Merged make build fix from core

parents 4f858a47 e40ed4f9
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
CMakeLists.txt
View file @ dd0f2577
...@@ -141,7 +141,9 @@ if(CMAKE_COMPILER_IS_GNUCXX) ...@@ -141,7 +141,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
endif() endif()
# #
set(CMAKE_CXX_FLAGS "-Wall ${GCC_EXTRA_OPTIONS} -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall ${GCC_EXTRA_OPTIONS} -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}")
#
### Make specific
if(${CMAKE_BUILD_TOOL} STREQUAL make OR ${CMAKE_BUILD_TOOL} STREQUAL gmake)
add_custom_target(debuggable $(MAKE) clean add_custom_target(debuggable $(MAKE) clean
COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR}
COMMENT "Adjusting settings for debug compilation" COMMENT "Adjusting settings for debug compilation"
...@@ -150,6 +152,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) ...@@ -150,6 +152,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR}
COMMENT "Adjusting settings for release compilation" COMMENT "Adjusting settings for release compilation"
VERBATIM) VERBATIM)
endif()
endif() endif()
# Microsoft VisualC++ specialities # Microsoft VisualC++ specialities
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment