Add Windows, MSVC, and MinGW support to build configuration.

- Set to use static or dynamic libraries at top level. - Compiler configuration for MSVC and MinGW. - Copy rather than create symlink for aliases on Windows.
facebookarchive · Jun 19, 2017 · 7a00183 · 7a00183
1 parent 183c087
commit 7a00183
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,35 +10,69 @@
 project(xcbuild C CXX)
 
 cmake_minimum_required(VERSION 3.0)
-set(CMAKE_MACOSX_RPATH 1)
+cmake_policy(SET CMP0054 NEW)
 
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
+set(BUILD_SHARED_LIBS True CACHE BOOL "Build shared libraries." FORCE)
+
+# Platform options.
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  # Export all symbols to avoid needing a `.def` file or `__dllexport`.
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS True)
+
+  if ("${CMAKE_CXX_PLATFORM_ID}" STREQUAL "MinGW")
+    # Use MinGW formatting rather than MSVCRT for C99 support.
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__USE_MINGW_ANSI_STDIO=1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__USE_MINGW_ANSI_STDIO=1")
+  endif ()
+elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  set(CMAKE_MACOSX_RPATH True)
   set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
-else ()
+elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
 endif ()
 
 # Output into root build directory.
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Language version.
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
+  # C++ is by default. C99 is not supported.
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else ()
+  message(WARNING "Compiler not supported to enable C++11.")
+endif ()
 
 # Unused language features.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
+else ()
+  message(WARNING "Compiler not supported to disable exceptions and RTTI.")
+endif ()
 
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND NOT "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+endif ()
 
 # Enable all warnings.
-add_compile_options(-Wall -Werror)
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  add_compile_options(-Wno-multichar -Wno-sign-compare)
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
+  add_compile_options(/D_CRT_SECURE_NO_WARNINGS) # TODO: /Wall /WX
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  add_compile_options(-Wall -Werror)
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    add_compile_options(-Wno-multichar -Wno-sign-compare)
+  endif ()
+else ()
+  message(WARNING "Compiler not supported to enable warnings.")
 endif ()
 
 # Enable color diagnostics.
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND NOT "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
   add_compile_options(-fcolor-diagnostics)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER "5.0")
   add_compile_options(-fdiagnostics-color)

diff --git a/Libraries/acdriver/CMakeLists.txt b/Libraries/acdriver/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(acdriver SHARED
+add_library(acdriver
             Sources/Options.cpp
             Sources/Driver.cpp
             Sources/Output.cpp

diff --git a/Libraries/builtin/CMakeLists.txt b/Libraries/builtin/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(builtin SHARED
+add_library(builtin
             Sources/Driver.cpp
             Sources/Registry.cpp
             #

diff --git a/Libraries/dependency/CMakeLists.txt b/Libraries/dependency/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(dependency SHARED
+add_library(dependency
             Sources/DependencyInfo.cpp
             Sources/DependencyInfoFormat.cpp
             Sources/BinaryDependencyInfo.cpp

diff --git a/Libraries/ext/CMakeLists.txt b/Libraries/ext/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(ext SHARED
+add_library(ext
             Sources/optional.cpp
             )
 

diff --git a/Libraries/graphics/CMakeLists.txt b/Libraries/graphics/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(graphics SHARED
+add_library(graphics
             Sources/Image.cpp
             Sources/PixelFormat.cpp
             Sources/Format/PNG.cpp

diff --git a/Libraries/libbom/CMakeLists.txt b/Libraries/libbom/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(bom SHARED
+add_library(bom
             Sources/bom.c
             Sources/bom_memory.c
             Sources/bom_tree.c

diff --git a/Libraries/libcar/CMakeLists.txt b/Libraries/libcar/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(car SHARED
+add_library(car
             Sources/Reader.cpp
             Sources/AttributeList.cpp
             Sources/Facet.cpp

diff --git a/Libraries/libutil/CMakeLists.txt b/Libraries/libutil/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(util SHARED
+add_library(util
             Sources/FSUtil.cpp
             Sources/Filesystem.cpp
             Sources/DefaultFilesystem.cpp

diff --git a/Libraries/ninja/CMakeLists.txt b/Libraries/ninja/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(ninja SHARED
+add_library(ninja
             Sources/Writer.cpp
             Sources/Value.cpp
             )

diff --git a/Libraries/pbxbuild/CMakeLists.txt b/Libraries/pbxbuild/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(pbxbuild SHARED
+add_library(pbxbuild
             Sources/DirectedGraph.cpp
             Sources/HeaderMap.cpp
             Sources/DerivedDataHash.cpp

diff --git a/Libraries/pbxproj/CMakeLists.txt b/Libraries/pbxproj/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(pbxproj SHARED
+add_library(pbxproj
             Sources/Context.cpp
             Sources/ISA.cpp
             Sources/PlistHelpers.cpp

diff --git a/Libraries/pbxsetting/CMakeLists.txt b/Libraries/pbxsetting/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(pbxsetting SHARED
+add_library(pbxsetting
             Sources/Condition.cpp
             Sources/DefaultSettings.cpp
             Sources/Environment.cpp

diff --git a/Libraries/pbxspec/CMakeLists.txt b/Libraries/pbxspec/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(pbxspec SHARED
+add_library(pbxspec
             Sources/Manager.cpp
             Sources/SpecificationType.cpp
             Sources/PBX/Architecture.cpp

diff --git a/Libraries/plist/CMakeLists.txt b/Libraries/plist/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(plist SHARED
+add_library(plist
             Sources/ObjectType.cpp
             Sources/Array.cpp
             Sources/Boolean.cpp

diff --git a/Libraries/process/CMakeLists.txt b/Libraries/process/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(process SHARED
+add_library(process
             Sources/Context.cpp
             Sources/DefaultContext.cpp
             Sources/MemoryContext.cpp

diff --git a/Libraries/xcassets/CMakeLists.txt b/Libraries/xcassets/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(xcassets SHARED
+add_library(xcassets
             Sources/BrandAssetRole.cpp
             Sources/Compression.cpp
             Sources/CubeFace.cpp

diff --git a/Libraries/xcdriver/CMakeLists.txt b/Libraries/xcdriver/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(xcdriver SHARED
+add_library(xcdriver
             Sources/Action.cpp
             Sources/Driver.cpp
             Sources/Options.cpp
@@ -39,10 +39,17 @@ add_executable(xcbuild Tools/xcbuild.cpp)
 target_link_libraries(xcbuild xcdriver)
 install(TARGETS xcbuild DESTINATION usr/bin)
 
-add_custom_command(TARGET xcbuild
-                   COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE_NAME:xcbuild> $<TARGET_FILE_DIR:xcbuild>/xcodebuild
-                   DEPENDS $<TARGET_FILE:xcbuild>)
-install(FILES $<TARGET_FILE_DIR:xcbuild>/xcodebuild DESTINATION usr/bin)
+set(ALIAS_PATH "$<TARGET_FILE_DIR:xcbuild>/xcodebuild${CMAKE_EXECUTABLE_SUFFIX}")
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  add_custom_command(TARGET xcbuild
+                     COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:xcbuild>" "${ALIAS_PATH}"
+                     DEPENDS "$<TARGET_FILE:xcbuild>")
+else ()
+  add_custom_command(TARGET xcbuild
+                     COMMAND "${CMAKE_COMMAND}" -E create_symlink "$<TARGET_FILE_NAME:xcbuild>" "${ALIAS_PATH}"
+                     DEPENDS "$<TARGET_FILE:xcbuild>")
+endif ()
+install(FILES "${ALIAS_PATH}" DESTINATION usr/bin)
 
 if (BUILD_TESTING)
   ADD_UNIT_GTEST(xcdriver Options Tests/test_Options.cpp)

diff --git a/Libraries/xcexecution/CMakeLists.txt b/Libraries/xcexecution/CMakeLists.txt
@@ -8,7 +8,7 @@
 #
 
 
-add_library(xcexecution SHARED
+add_library(xcexecution
             Sources/Parameters.cpp
             Sources/Executor.cpp
             Sources/SimpleExecutor.cpp

diff --git a/Libraries/xcformatter/CMakeLists.txt b/Libraries/xcformatter/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(xcformatter SHARED
+add_library(xcformatter
             Sources/Formatter.cpp
             Sources/DefaultFormatter.cpp
             Sources/NullFormatter.cpp

diff --git a/Libraries/xcscheme/CMakeLists.txt b/Libraries/xcscheme/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(xcscheme SHARED
+add_library(xcscheme
             Sources/SchemeGroup.cpp
             Sources/XC/Action.cpp
             Sources/XC/ActionContent.cpp

diff --git a/Libraries/xcsdk/CMakeLists.txt b/Libraries/xcsdk/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(xcsdk SHARED
+add_library(xcsdk
             Sources/Configuration.cpp
             Sources/Environment.cpp
             Sources/SDK/Manager.cpp

diff --git a/Libraries/xcworkspace/CMakeLists.txt b/Libraries/xcworkspace/CMakeLists.txt
@@ -7,7 +7,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 #
 
-add_library(xcworkspace SHARED
+add_library(xcworkspace
             Sources/XC/Workspace.cpp
             Sources/XC/FileRef.cpp
             Sources/XC/Group.cpp