Issue #192 - no need to check architecture
This commit is contained in:
parent
f5eb2cf26a
commit
a8e98412b5
|
@ -24,13 +24,6 @@ option( BUILD_SHARED_LIB "Set ON to build Shared (DLL) Library" OFF )
|
||||||
option( BUILD_TAB2SPACE "Set ON to build utility app, tab2space" OFF )
|
option( BUILD_TAB2SPACE "Set ON to build utility app, tab2space" OFF )
|
||||||
option( BUILD_SAMPLE_CODE "Set ON to build the sample code" OFF )
|
option( BUILD_SAMPLE_CODE "Set ON to build the sample code" OFF )
|
||||||
|
|
||||||
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
message(STATUS "*** Have SIZEOF void * = 8, so 64-bit")
|
|
||||||
set( IS_64_BIT 1 )
|
|
||||||
else ()
|
|
||||||
message(STATUS "*** SIZEOF void * != 8, so not 64-bit")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
set( WARNING_FLAGS -Wall )
|
set( WARNING_FLAGS -Wall )
|
||||||
endif(CMAKE_COMPILER_IS_GNUCXX)
|
endif(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
@ -50,9 +43,6 @@ if(WIN32 AND MSVC)
|
||||||
set(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
|
set(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
|
||||||
endforeach()
|
endforeach()
|
||||||
set( MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS" )
|
set( MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS" )
|
||||||
if (IS_64_BIT)
|
|
||||||
set( MSVC_FLAGS "${MSVC_FLAGS} -DWIN64" )
|
|
||||||
endif ()
|
|
||||||
# if (${MSVC_VERSION} EQUAL 1600)
|
# if (${MSVC_VERSION} EQUAL 1600)
|
||||||
# set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
|
# set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
|
||||||
# endif (${MSVC_VERSION} EQUAL 1600)
|
# endif (${MSVC_VERSION} EQUAL 1600)
|
||||||
|
|
Loading…
Reference in a new issue