Merge pull request #180 from flagarde/cmake_fixes

Fix W3/W4 warning on windows and installation of the library/examples

Author: staxfur

CMakeLists.txt

@@ -1,6 +1,17 @@
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
-project(cpp-terminal 
+# see https://cmake.org/cmake/help/latest/policy/CMP0092.html
+set(CMAKE_CXX_FLAGS_OLD ${CMAKE_CXX_FLAGS})
+if(MSVC)
+  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+  endif()
+endif()
+
+
+project(cpp-terminal
         VERSION 1.0.0
         DESCRIPTION "Small header only C++ library for writing multiplatform terminal applications"
         HOMEPAGE_URL "https://github.com/jupyter-xeus/cpp-terminal"
@@ -34,3 +45,7 @@ if (CPPTERMINAL_ENABLE_INSTALL)
   install_library(cpp-terminal)
 
 endif()
+
+if(MSVC)
+  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_OLD})
+endif()

cpp-terminal/CMakeLists.txt

@@ -4,12 +4,8 @@ configure_file(version.h.in version.h)
 # create and configure library target
 add_library(cpp-terminal base.cpp prompt.cpp window.cpp input.cpp private/platform.cpp)
 
-target_include_directories(cpp-terminal BEFORE PUBLIC
-    ${cpp-terminal_SOURCE_DIR}
-)
-
-target_include_directories(cpp-terminal INTERFACE ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
+target_include_directories(cpp-terminal PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/private> PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/cpp-terminal> )
 
 set_target_properties(cpp-terminal PROPERTIES
-    PUBLIC_HEADER "cpp-terminal/version.h;cpp-terminal/base.hpp;cpp-terminal/prompt.hpp;cpp-terminal/window.hpp;cpp-terminal/input.hpp"
+    PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/version.h;${CMAKE_CURRENT_SOURCE_DIR}/base.hpp;${CMAKE_CURRENT_SOURCE_DIR}/prompt.hpp;${CMAKE_CURRENT_SOURCE_DIR}/window.hpp;${CMAKE_CURRENT_SOURCE_DIR}/input.hpp"
 )

examples/CMakeLists.txt

@@ -55,4 +55,8 @@ foreach(target kilo menu menu_window keys colors)
                 target_compile_options(${target} PRIVATE "-Werror")
                 target_compile_options(${target} PRIVATE "-Wno-sign-compare")
         endif()
-endforeach()
+endforeach()
+
+if(CPPTERMINAL_ENABLE_INSTALL)
+install(TARGETS prompt_multiline prompt_immediate prompt_not_immediate prompt_simple kilo menu menu_window menu_window_24bit keys colors read_stdin RUNTIME DESTINATION bin/examples)
+endif()