Should compile again with appveyor

Author: kleag

SetCompilerFlags.cmake

@@ -46,13 +46,19 @@ if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
     CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STDCPP0X)
     CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STDCPP11)
     CHECK_CXX_COMPILER_FLAG(-std=c++14 HAVE_STDCPP14)
+    CHECK_CXX_COMPILER_FLAG(-std=c++17 HAVE_STDCPP17)
     CHECK_CXX_COMPILER_FLAG(-fsanitize=undefined HAVE_SANITIZE_UNDEFINED)
     CHECK_CXX_COMPILER_FLAG(-fno-omit-frame-pointer HAVE_NO_OMIT_FRAME_POINTER)
     if (HAVE_NO_OMIT_FRAME_POINTER)
       set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer")
     endif()
 
-    if (HAVE_STDCPP14)
+    if (HAVE_STDCPP17)
+      message("C++17 supported ")
+      set(CMAKE_CXX_STANDARD 17)
+      set(CMAKE_CXX_STANDARD_REQUIRED ON)
+      set(CMAKE_CXX_EXTENSIONS OFF)
+    elseif (HAVE_STDCPP14)
       message("C++14 supported ")
       set(CMAKE_CXX_STANDARD 14)
       set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -115,6 +121,9 @@ if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
     set(LIB_INSTALL_DIR "lib")
 else ()
   message("Windows flags")
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS OFF)
   add_definitions(-D WIN32)
 
   # By default, do not warn when built on machines using only VS Express:

appveyor.yml

@@ -27,7 +27,8 @@ environment:
 
 configuration: Release
 
-os: Visual Studio 2015
+os: Visual Studio 2017
+#os: Visual Studio 2015
 #os: Visual Studio 2013
 
 install:

lima_common/CMakeLists.txt

@@ -17,16 +17,6 @@
 project(limacommon)
 cmake_minimum_required(VERSION 3.4.0)
 
-#cmake_policy
-if(POLICY CMP0020)
-cmake_policy(SET CMP0020 OLD)
-endif()
-
-# Use these cmake parameters (adapt to your setup) to compile under Windows
-# -DCMAKE_INSTALL_PREFIX="c:/amose" -DCMAKE_BUILD_TYPE=Release
-# -DCMAKE_INSTALL_PREFIX="c:/amose-debug" -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-set(CMAKE_USE_RELATIVE_PATHS OFF)
 enable_testing()
 
 # include(${CMAKE_SOURCE_DIR}/../SystemSpecificInformations.cmake)
@@ -71,7 +61,8 @@ set( Boost_USE_STATIC_LIBS OFF )
 set( Boost_USE_MULTITHREADED ON )
 set( Boost_USE_STATIC_RUNTIME OFF )
 set( BOOST_LIB_DIAGNOSTIC )
-find_package(Boost 1.54 REQUIRED COMPONENTS unit_test_framework system filesystem)
+find_package(Boost 1.54 REQUIRED 
+  COMPONENTS unit_test_framework system filesystem)
 message("Boost_INCLUDE_DIR= ${Boost_INCLUDE_DIR}")
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIRS})

lima_common/conf/log4cpp.properties

@@ -81,5 +81,5 @@ log4j.category.Automaton::Compiler=ERROR
 
 #Appenders
 log4j.appender.DebugOutput=
-#log4j.appender.File=<absolute or relative path to a file>
+log4j.appender.File=/c/b/log.txt
 

lima_common/src/common/tools/CMakeLists.txt

@@ -39,22 +39,20 @@ SET(lima-common-tools_LIB_SRCS
     FileUtils.cpp
   )
 
-if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
-SET(lima-common-tools_LIB_SRCS
-    ${lima-common-tools_LIB_SRCS}
-  )
-
-endif()
-add_library(lima-common-tools SHARED ${lima-common-tools_LIB_SRCS} ${lima-common-tools_MOC_OUTFILES})
+add_library(lima-common-tools SHARED ${lima-common-tools_LIB_SRCS})
 ADD_DLL_TO_PATH(lima-common-tools)
 
 target_link_libraries(lima-common-tools
   Qt5::Core
 )
 
-set_target_properties(lima-common-tools PROPERTIES VERSION ${LIMA_COMMON_LIB_VERSION} SOVERSION ${LIMA_COMMON_LIB_SOVERSION})
-install(TARGETS lima-common-tools DESTINATION ${LIB_INSTALL_DIR}
-    COMPONENT runtime)
+set_target_properties(lima-common-tools PROPERTIES 
+  VERSION ${LIMA_COMMON_LIB_VERSION} 
+  SOVERSION ${LIMA_COMMON_LIB_SOVERSION})
+  
+install(TARGETS lima-common-tools 
+  DESTINATION ${LIB_INSTALL_DIR}
+  COMPONENT runtime)
 
 add_subdirectory(tests)
 

lima_common/src/common/tools/tests/CMakeLists.txt

@@ -15,6 +15,7 @@ add_executable(LimaFileSystemWatcherTest0
 
 target_link_libraries(LimaFileSystemWatcherTest0
   lima-common-factory
+  lima-common-tools
   Qt5::Test
 )
 

lima_linguisticprocessing/tools/automatonCompiler/compile-rules.cpp

@@ -299,19 +299,22 @@ int run(int argc, char** argv)
 
   if (QsLogging::initQsLog(configPath) != 0)
   {
-    LOGINIT("Automaton::Compiler");
-    LERROR << "Call to QsLogging::initQsLog(\"" << configPath << "\") failed.";
+    std::cerr << "Call to QsLogging::initQsLog(\"" << configPath.toStdString() 
+              << "\") failed.";
     return EXIT_FAILURE;
   }
-
+  std::cerr << "compile_rules before Lima::AmosePluginsManager::single";
   // Necessary to initialize factories
   Lima::AmosePluginsManager::single();
 //   Lima::AmosePluginsManiager::changeable().loadPlugins(configPath);
+  std::cerr << "compile_rules before loadPlugins";
   if (!Lima::AmosePluginsManager::changeable().loadPlugins(configPath))
   {
     LOGINIT("Automaton::Compiler");
     LERROR << "compile-rules: Call to loadPlugins(\""
             << configPath << "\") failed.";
+    std::cerr << "compile-rules: Call to loadPlugins(\""
+              << configPath.toStdString() << "\") failed.";
     return EXIT_FAILURE;
   }
 
@@ -325,6 +328,7 @@ int run(int argc, char** argv)
     LOGINIT("Automaton::Compiler");
     LDEBUG << "main: MediaticData::changeable().init( "
             << param.resourcesDir << ")...";
+  std::cerr << "compile_rules before MediaticData::changeable().init";
     MediaticData::changeable().init(
       resourcesPath.toUtf8().constData(),
       configPath.toUtf8().constData(),
@@ -374,6 +378,9 @@ int run(int argc, char** argv)
       LOGINIT("Automaton::Compiler");
       LERROR << "No language was configured configured with" << configDirs
               << "and" << param.lpConfigFile.c_str();
+      std::cerr << "No language was configured configured with" 
+                << configDirs.join(":").toStdString()
+                << "and" << param.lpConfigFile;
       return EXIT_FAILURE;
     }
 

lima_linguisticprocessing/tools/automatonCompiler/libautomatonCompiler/CMakeLists.txt

@@ -40,6 +40,7 @@ ADD_DLL_TO_PATH(lima-lp-automatoncompiler)
 target_link_libraries(lima-lp-automatoncompiler
   lima-lp-automaton
   lima-lp-analysisdict
+  lima-xp-core
 )
 
 set_target_properties(lima-lp-automatoncompiler PROPERTIES VERSION ${LIMA_LP_LIB_VERSION} SOVERSION ${LIMA_LP_LIB_SOVERSION})

lima_pelf/CMakeLists.txt

@@ -74,6 +74,8 @@ ENDIF(SVMTOOL++_FOUND)
 # include(${CMAKE_SOURCE_DIR}/../manageQt5.cmake)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
 addQt5Modules(Core Xml XmlPatterns Gui Widgets)
 
 # include_directories(${Qt5_INCLUDES})

lima_pelf/resourceTool/CMakeLists.txt

@@ -31,6 +31,8 @@ set(pelf-resedit_UIS
 # Wrap Qt UIs
 qt5_wrap_ui(pelf-resedit_UIS_H ${pelf-resedit_UIS})
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
 
 # Compile, link and install main exec
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

manageQt5.cmake

@@ -32,6 +32,8 @@ endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
 
 # This macro does the find_package with the required Qt5 modules listed as
 # parameters. Note that the Qt5_INCLUDES variable is not necessary anymore as