Apply PR suggestions

Author: mcbarton

CMakeLists.txt

@@ -451,7 +451,6 @@ option(CPPINTEROP_INCLUDE_DOCS "Generate build targets for the CppInterOp docs."
 option(CPPINTEROP_ENABLE_DOXYGEN "Use doxygen to generate CppInterOp interal API documentation.")
 option(CPPINTEROP_ENABLE_SPHINX "Use sphinx to generage CppInterOp user documentation")
 
-option(CPPINTEROP_ENABLE_TESTING "Enables the testing infrastructure." ON)
 
 if(MSVC)
 

lib/Interpreter/CMakeLists.txt

@@ -132,10 +132,12 @@ if(EMSCRIPTEN)
     NO_SONAME 1
     LINK_FLAGS "-s WASM_BIGINT  -s SIDE_MODULE=1 ${SYMBOLS_LIST}"
   )
-  # When compiling Emscripten tests the shared library it links to is expected to be in the same folder as the compiled Javascript
-  add_custom_command(TARGET clangCppInterOp POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:clangCppInterOp> ${CMAKE_BINARY_DIR}/unittests/CppInterOp/
-  )
+  if (CPPINTEROP_ENABLE_TESTING)
+    # When compiling Emscripten tests the shared library it links to is expected to be in the same folder as the compiled Javascript
+    add_custom_command(TARGET clangCppInterOp POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:clangCppInterOp> ${CMAKE_BINARY_DIR}/unittests/CppInterOp/
+    )
+  endif(CPPINTEROP_ENABLE_TESTING)
 endif()
 
 string(REPLACE ";" "\;" _VER CPPINTEROP_VERSION)

unittests/CppInterOp/CMakeLists.txt

@@ -34,7 +34,6 @@ if(EMSCRIPTEN)
   # Without ALLOW_MEMORY_GROWTH=1 tests will fail with aborted(OOM). Approach to fix taken from answers to
   # https://stackoverflow.com/questions/67222200/runtimeerror-abortoom-build-with-s-assertions-1-for-more-info
   set_target_properties(CppInterOpTests PROPERTIES
-    COMPILE_FLAGS "-s MAIN_MODULE=1"
     LINK_FLAGS "-s MAIN_MODULE=1 -s WASM_BIGINT -s EXPORTED_RUNTIME_METHODS='[\"FS\",\"PATH\",\"LDSO\",\"loadDynamicLibrary\",\"ERRNO_CODES\"]' --preload-file ${SYSROOT_PATH}/include@/include -s ALLOW_MEMORY_GROWTH=1"
   )
 endif()
@@ -79,7 +78,6 @@ if(EMSCRIPTEN)
   # Without ALLOW_MEMORY_GROWTH=1 tests will fail with aborted(OOM). Approach to fix taken from answers to
   # https://stackoverflow.com/questions/67222200/runtimeerror-abortoom-build-with-s-assertions-1-for-more-info
   set_target_properties(DynamicLibraryManagerTests PROPERTIES
-    COMPILE_FLAGS "-s MAIN_MODULE=1"
     LINK_FLAGS "-s MAIN_MODULE=1 -s WASM_BIGINT -s EXPORTED_RUNTIME_METHODS='[\"FS\",\"PATH\",\"LDSO\",\"loadDynamicLibrary\",\"ERRNO_CODES\"]' --preload-file ${SYSROOT_PATH}/include@/include -s ALLOW_MEMORY_GROWTH=1"
   )
 endif()