Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CMakeLists.txt and include directive #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

Fix CMakeLists.txt and include directive #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ cmake_minimum_required( VERSION 3.1.0 FATAL_ERROR )
project( "core" VERSION 1.0.0 LANGUAGES CXX )
message( "Copyright 2013-2018, Corvusoft Ltd, All Rights Reserved." )

set(BUILD_TESTS OFF CACHE BOOL "Build tests")

#
# Dependencies
#
@@ -22,7 +24,7 @@ if ( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
endif ( )

if( ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=0x0601 /W4 /wd4068 /wd4702" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=0x0601 /W4 /wd4068 /wd4702 /Za" )
endif ( )

if( NOT WIN32 )
@@ -59,9 +61,11 @@ set_target_properties( ${SHARED_LIBRARY_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_N
set_target_properties( ${SHARED_LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR} VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
target_link_libraries( ${SHARED_LIBRARY_NAME} )

enable_testing( )
add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" )
add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" )
if ( BUILD_TESTS )
enable_testing( )
add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" )
add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" )
endif()

#
# Install
1 change: 1 addition & 0 deletions source/corvusoft/core/detail/settings_impl.hpp
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
#include <map>
#include <string>
#include <algorithm>
#include <cctype>

//Project Includes