diff options
| author | Rr42 | 2018-06-08 11:04:51 +0530 |
|---|---|---|
| committer | Rr42 | 2018-06-08 11:04:51 +0530 |
| commit | 71110f26a7928eaa656cc9246c0bb58316c7ae92 (patch) | |
| tree | 6d4c871a9dc1de6235e06266a702bc2d66033c24 /ldmicro | |
| parent | afc06f7ce6abfa709a461fcfb1e00f6d050eb2a9 (diff) | |
| download | LDMicroGtk-71110f26a7928eaa656cc9246c0bb58316c7ae92.tar.gz LDMicroGtk-71110f26a7928eaa656cc9246c0bb58316c7ae92.tar.bz2 LDMicroGtk-71110f26a7928eaa656cc9246c0bb58316c7ae92.zip | |
Fixed, include bug caused because gnu was not set to c++11 standard.
Diffstat (limited to 'ldmicro')
| -rw-r--r-- | ldmicro/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | ldmicro/lib/linuxUI/linuxUI.h | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt index aeb706f..c45e2b4 100644 --- a/ldmicro/CMakeLists.txt +++ b/ldmicro/CMakeLists.txt @@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 2.6) project(LDMicro) +macro(use_cxx11) + +if (CMAKE_VERSION VERSION_LESS "3.1") + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") + endif () +else () + set (CMAKE_CXX_STANDARD 11) +endif () + +endmacro(use_cxx11) + IF(WIN32) MESSAGE( FATAL_ERROR "Cannot build for windows, exiting" ) add_definitions(-D__WIN32__) @@ -16,6 +28,8 @@ IF(UNIX) MESSAGE( STATUS "Initializing.." ) add_definitions(-D__UNIX__) add_definitions(-DLDLANG_EN) + use_cxx11() + # set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/build/") MESSAGE( STATUS "Performing system check.." ) @@ -42,7 +56,7 @@ IF(UNIX) add_custom_command( OUTPUT ${OBJDIR}/lang-tables.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/lang-tables.pl > ${OBJDIR}/lang-tables.h + COMMAND perl lang-tables.pl > ${OBJDIR}/lang-tables.h DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/lang-*.txt") add_custom_command( diff --git a/ldmicro/lib/linuxUI/linuxUI.h b/ldmicro/lib/linuxUI/linuxUI.h index c6bb1ac..09aa981 100644 --- a/ldmicro/lib/linuxUI/linuxUI.h +++ b/ldmicro/lib/linuxUI/linuxUI.h @@ -6,8 +6,9 @@ #include <linux/limits.h> #include <stdio.h> #include <inttypes.h> +#include <string.h> +#include <stdlib.h> #include "linuxLD.h" -//#include "windows.h" /// version control #define LDMicro_VERSION_MAJOR 1 |