Refactor CMakeLists.txt (#164)

* Refactor CMakeLists.txt

* address review

* remove unresolved todo

Author: anutosh491

CMakeLists.txt

@@ -51,15 +51,16 @@ message(STATUS "Building xeus-cpp v${${PROJECT_NAME}_VERSION}")
 # =============
 
 option(XEUS_CPP_BUILD_STATIC "Build xeus-cpp static library" ON)
-OPTION(XEUS_CPP_BUILD_SHARED "Split xcpp build into executable and library" ON)
-OPTION(XEUS_CPP_BUILD_EXECUTABLE "Build the xcpp executable" ON)
+option(XEUS_CPP_BUILD_SHARED "Split xcpp build into executable and library" ON)
+option(XEUS_CPP_BUILD_EXECUTABLE "Build the xcpp executable" ON)
 
-OPTION(XEUS_CPP_USE_SHARED_XEUS "Link xcpp  with the xeus shared library (instead of the static library)" ON)
-OPTION(XEUS_CPP_USE_SHARED_XEUS_CPP "Link xcpp  with the xeus shared library (instead of the static library)" ON)
+option(XEUS_CPP_USE_SHARED_XEUS "Link xcpp  with the xeus shared library (instead of the static library)" ON)
+option(XEUS_CPP_USE_SHARED_XEUS_CPP "Link xcpp  with the xeus shared library (instead of the static library)" ON)
+option(XEUS_CPP_EMSCRIPTEN_WASM_BUILD "Build for wasm with emscripten" OFF)
 
 # Test options
-OPTION(XEUS_CPP_BUILD_TESTS "xeus-cpp test suite" ON)
-OPTION(XEUS_CPP_ENABLE_CODE_COVERAGE "xeus-cpp test suite" OFF)
+option(XEUS_CPP_BUILD_TESTS "xeus-cpp test suite" ON)
+option(XEUS_CPP_ENABLE_CODE_COVERAGE "xeus-cpp test suite" OFF)
 if(XEUS_CPP_ENABLE_CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
   if(NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
@@ -76,20 +77,22 @@ endif()
 if(EMSCRIPTEN)
     add_compile_definitions(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)
     message("Build with emscripten")
-    SET(XEUS_CPP_BUILD_STATIC ON)
-    SET(XEUS_CPP_BUILD_SHARED OFF)
-    SET(XEUS_CPP_BUILD_EXECUTABLE OFF)
-    SET(XEUS_CPP_USE_SHARED_XEUS OFF)
-    SET(XEUS_CPP_USE_SHARED_XEUS_CPP OFF)
-    SET(XEUS_CPP_BUILD_TESTS OFF)
+    set(XEUS_CPP_BUILD_STATIC ON)
+    set(XEUS_CPP_BUILD_SHARED OFF)
+    set(XEUS_CPP_BUILD_EXECUTABLE OFF)
+    set(XEUS_CPP_USE_SHARED_XEUS OFF)
+    set(XEUS_CPP_USE_SHARED_XEUS_CPP OFF)
+    set(XEUS_CPP_BUILD_TESTS OFF)
+    # ENV (https://github.com/emscripten-core/emscripten/commit/6d9681ad04f60b41ef6345ab06c29bbc9eeb84e0)
+    set(EMSCRIPTEN_FEATURES "${EMSCRIPTEN_FEATURES} -s \"EXTRA_EXPORTED_RUNTIME_METHODS=[ENV']\"")
 endif()
 
-
 # Dependencies
 # ============
 
 set(xeus_REQUIRED_VERSION 5.0.0)
 set(xeus_zmq_REQUIRED_VERSION 3.0.0)
+set(CppInterOp_REQUIRED_VERSION 1.3.0)
 
 if (NOT TARGET xeus AND NOT TARGET xeus-static)
     find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED)
@@ -98,31 +101,6 @@ if (NOT TARGET xeus AND NOT TARGET xeus-static)
     endif()
 endif ()
 
-set(CppInterOp_REQUIRED_VERSION 1.3.0)
-
-# Flags
-# =====
-include(CheckCXXCompilerFlag)
-
-if (MSVC)
-  add_compile_options(/wd4251 /wd4141)
-  add_compile_options(/wd4018 /wd4267 /wd4715 /wd4146 /wd4129)
-  add_compile_options(/EHsc)
-else()
-  add_compile_options(-fexceptions)
-endif ()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    if(NOT EMSCRIPTEN)
-        add_compile_options(-Wunused-parameter -Wextra -Wreorder)
-    endif()
-endif ()
-
-if(EMSCRIPTEN)
-    # ENV (https://github.com/emscripten-core/emscripten/commit/6d9681ad04f60b41ef6345ab06c29bbc9eeb84e0)
-    set(EMSCRIPTEN_FEATURES "${EMSCRIPTEN_FEATURES} -s \"EXTRA_EXPORTED_RUNTIME_METHODS=[ENV']\"")
-endif()
-
 find_package(CppInterOp ${CppInterOp_REQUIRED_VERSION} REQUIRED)
 if(CppInterOp_FOUND)
   message(STATUS "Found CppInterOp: config=${CPPINTEROP_CONFIG} dir=${CPPINTEROP_DIR} (found version=${CPPINTEROP_VERSION} compatible with Clang ${CPPINTEROP_LLVM_VERSION_MAJOR}.x)")
@@ -234,13 +212,20 @@ macro(xeus_cpp_set_common_options target_name)
     if (MSVC)
         target_compile_options(${target_name} PUBLIC /wd4251 /wd4141)
         target_compile_options(${target_name} PUBLIC /wd4018 /wd4267 /wd4715 /wd4146 /wd4129)
+        target_compile_options(${target_name} PUBLIC /EHsc)
+    else ()
+        target_compile_options(${target_name} PUBLIC -fexceptions)
     endif ()
 
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
         CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
         CMAKE_CXX_COMPILER_ID MATCHES "Intel")
 
-        target_compile_options(${target_name} PUBLIC -Wunused-parameter -Wextra -Wreorder)
+        if (EMSCRIPTEN)
+            target_compile_options(${target_name} PRIVATE -fPIC)
+        else ()
+            target_compile_options(${target_name} PUBLIC -Wunused-parameter -Wextra -Wreorder)
+        endif()
 
         # C++17 flag
         CHECK_CXX_COMPILER_FLAG("-std=c++17" HAS_CPP_17_FLAG)
@@ -347,7 +332,6 @@ macro(xeus_cpp_create_target target_name linkage output_name)
         # Curl initialised specifically for xassist
         target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse curl)
     else ()
-        # TODO : Add curl support for emscripten
         target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse)
     endif()
 
@@ -505,9 +489,6 @@ if (XEUS_CPP_BUILD_SHARED)
 endif ()
 
 if(EMSCRIPTEN)
-    install(TARGETS xcpp
-            ARCHIVE DESTINATION ${XEUS_CPP_CMAKECONFIG_INSTALL_DIR})
-
     install(FILES
             "$<TARGET_FILE_DIR:xcpp>/xcpp.js"
             "$<TARGET_FILE_DIR:xcpp>/xcpp.wasm"

xeus-cppConfig.cmake.in

@@ -21,7 +21,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMAKE_MODULE_PATH}")
 @XEUS_CPP_CONFIG_CODE@
 
 include(CMakeFindDependencyMacro)
-find_dependency(xeus-zmq @xeus-zmq_REQUIRED_VERSION@)
+if (NOT @XEUS_CPP_EMSCRIPTEN_WASM_BUILD@)
+    find_dependency(xeus-zmq @xeus-zmq_REQUIRED_VERSION@)
+endif ()
 
 if (NOT TARGET xeus-cpp AND NOT TARGET xeus-cpp-static)
     include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")