Merge pull request #368 from SylvainCorlay/cxxopts

Relax cxxopts requirement

.appveyor.yml

@@ -26,7 +26,7 @@ install:
   - conda update -q conda
   - conda info -a
   # Install dependencies
-  - conda install cmake dirent xeus=0.25.0 cling=0.7 clangdev=5 llvmdev=5 nlohmann_json cppzmq xtl pugixml cxxopts=2.1.1 -c conda-forge
+  - conda install cmake dirent xeus=0.25.0 cling=0.7 clangdev=5 llvmdev=5 nlohmann_json cppzmq xtl pugixml cxxopts -c conda-forge
   # Build and install xeus-cling
   - mkdir build
   - cd build

README.md

@@ -35,7 +35,7 @@ conda install xeus-cling -c conda-forge
 You will first need to create a new environment and install the dependencies:
 
 ```bash
-conda create -n xeus-cling -c conda-forge cmake xeus=0.23.3 cling=0.6.0 clangdev=5.0 llvmdev=5 nlohmann_json cppzmq=4.3.0 xtl=0.6.9 pugixml cxxopts=2.1.1
+conda create -n xeus-cling -c conda-forge cmake xeus=0.25.0 cling=0.7.0 clangdev=5.0 llvmdev=5 nlohmann_json cppzmq xtl pugixml cxxopts
 conda activate xeus-cling
 ```
 

environment-dev.yml

@@ -13,7 +13,7 @@ dependencies:
   - cppzmq
   - xtl
   - pugixml
-  - cxxopts=2.1.1
+  - cxxopts
   # Test dependencies
   - pytest
   - jupyter_kernel_test

test/CMakeLists.txt

@@ -23,19 +23,8 @@ endif ()
 message(STATUS "Forcing tests build type to Release")
 set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
 
-include(CheckCXXCompilerFlag)
-
 string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Intel)
-    add_compile_options(-Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion)
-
-    CHECK_CXX_COMPILER_FLAG(-march=native HAS_MARCH_NATIVE)
-    if (HAS_MARCH_NATIVE)
-        add_compile_options(-march=native)
-    endif()
-endif()
-
 if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
     add_compile_options(/EHsc /MP /bigobj)
     set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
@@ -63,7 +52,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
     endif()
 
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- 
+
     # Add googletest directly to our build. This defines
     # the gtest and gtest_main targets.
     add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
@@ -103,7 +92,9 @@ set_target_properties(test_xeus_cling PROPERTIES
     INSTALL_RPATH_USE_LINK_PATH TRUE
 )
 
-target_link_libraries(test_xeus_cling ${GTEST_BOTH_LIBRARIES} Threads::Threads)
+target_link_libraries(test_xeus_cling
+                      PRIVATE ${GTEST_BOTH_LIBRARIES}
+                      PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 target_include_directories(test_xeus_cling PRIVATE ${XEUS_CLING_INCLUDE_DIR})
 
 add_custom_target(xtest COMMAND test_xeus_cling DEPENDS test_xeus_cling)