Revert changes

Author: mcbarton

CMakeLists.txt

@@ -241,9 +241,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
   include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
   separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
   add_definitions(${LLVM_DEFINITIONS_LIST})
-  IF(WIN32 AND NOT MSVC)
-    remove_definitions(-DNDEBUG -D_DEBUG)
-  endif()
+  
   if (USE_CLING)
     message(STATUS "CLING_INCLUDE_DIRS: ${CLING_INCLUDE_DIRS}")
   endif(USE_CLING)
@@ -309,11 +307,6 @@ if (MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
 endif ()
 
-# Attempt to fix emulated tls missing symbols
-if (WIN32 AND NOT MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -femulated-tls -fno-threadsafe-statics")
-endif ()
-
 if (APPLE)
   set(CMAKE_MODULE_LINKER_FLAGS "-Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
 endif ()

cmake/CppInterOp/CppInterOpConfig.cmake.in

@@ -9,7 +9,11 @@ get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}"
 # Determine CMAKE_SHARED_LIBRARY_SUFFIX based on operating system
 include(CMakeSystemSpecificInformation)
 
-set(shared_lib_dir lib)
+if(MSVC)
+  set(shared_lib_dir bin)
+else()
+  set(shared_lib_dir lib)
+endif()
 
 ### build/install workaround
 if (@BUILD_SHARED_LIBS@)
@@ -52,7 +56,7 @@ set_target_properties(clangCppInterOp PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${_include}
   IMPORTED_LOCATION ${_lib}
   )
-if (WIN32)
+if (MSVC)
   if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/include")
     set(_static_lib "${CPPINTEROP_INSTALL_PREFIX}/lib/${_lib_prefix}clangCppInterOp.lib")
   else()
@@ -62,7 +66,7 @@ if (WIN32)
   set_target_properties(clangCppInterOp PROPERTIES
     IMPORTED_IMPLIB ${_static_lib}
     )
-endif(WIN32)
+endif(MSVC)
 
 unset(_lib_prefix)
 unset(_lib_suffix)

cmake/modules/GoogleTest.cmake

@@ -1,6 +1,5 @@
 set(_gtest_byproduct_binary_dir
-  ${CMAKE_BINARY_DIR}/googletest-prefix/src/googletest-stamp)
-
+  ${CMAKE_BINARY_DIR}/downloads/googletest-prefix/src/googletest-build)
 set(_gtest_byproducts
   ${_gtest_byproduct_binary_dir}/lib/libgtest.a
   ${_gtest_byproduct_binary_dir}/lib/libgtest_main.a
@@ -21,14 +20,6 @@ elseif(APPLE)
 endif()
 
 include(ExternalProject)
-IF(WIN32 AND NOT MSVC)
-  IF(NOT MSVC)
-    string(REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS_GTEST ${CMAKE_CXX_FLAGS})
-    set(CMAKE_CXX_FLAGS_GTEST "${CMAKE_CXX_FLAGS_GTEST} -Wno-language-extension-token")
-  else()
-    set(CMAKE_CXX_FLAGS_GTEST "${CMAKE_CXX_FLAGS}")
-  endif()
-endif()
 ExternalProject_Add(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
@@ -45,7 +36,7 @@ ExternalProject_Add(
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_GTEST}
+                -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
                 -DCMAKE_AR=${CMAKE_AR}
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 ${EXTRA_GTEST_OPTS}

lib/Interpreter/DynamicLibraryManager.cpp

@@ -52,7 +52,7 @@ namespace Cpp {
     // Behaviour is to not add paths that don't exist...In an interpreted env
     // does this make sense? Path could pop into existance at any time.
     for (const char* Var : kSysLibraryEnv) {
-#if defined(_WIN32)
+#ifdef _WIN32
       char* Env = nullptr;
       size_t sz = 0;
       if (_dupenv_s(&Env, &sz, Var)) {

lib/Interpreter/Paths.cpp

@@ -168,7 +168,7 @@ bool ExpandEnvVars(std::string& Str, bool Path) {
 
     std::string EnvVar = Str.substr(DPos + 1, Length -1); //"HOME"
     std::string FullPath;
-#if defined(_WIN32)
+#ifdef _WIN32
     char* Tok = nullptr;
     size_t sz = 0;
     if (_dupenv_s(&Tok, &sz, EnvVar.c_str()))