splitting compiler/platform-specific flags into corresponding files

Author: ye11owSub

CMakeLists.txt

@@ -15,32 +15,15 @@ foreach(FOLDER_NAME IN ITEMS layer0 layer1 layer2 layer3 layer4 layer5 ov)
 endforeach()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(Dependencies)
 include(Helpers)
-
-target_link_options(${TARGET_NAME} PRIVATE
-    "$<$<PLATFORM_ID:Darwin>:LINKER:-undefined,dynamic_lookup>"
-)
+include(Dependencies)
+# Darwin, Windows, Linux
+include(platform/${CMAKE_SYSTEM_NAME})
+# MSVC, GCC, Clang
+include(compiler/${CMAKE_CXX_COMPILER_FRONTEND_VARIANT})
 
 target_compile_options(${TARGET_NAME} PRIVATE
     ${ALL_COMP_ARGS}
-
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
-        -Werror=return-type
-        -Wunused-variable
-        -Wno-switch
-        -Wno-narrowing
-        -Wno-char-subscripts
-        $<$<CONFIG:Debug>:-Og>
-        $<$<NOT:$<CONFIG:Debug>>:-O3>
-    >
-    $<$<CXX_COMPILER_ID:MSVC>:/MP>
-    $<$<CXX_COMPILER_ID:MSVC>:/std:c++17>
-    $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:MSVC>>:/Z7>
-
-    # optimization currently causes a clang segfault on OS X 10.9 when
-    # compiling layer2/RepCylBond.cpp
-    $<$<PLATFORM_ID:Darwin>:-fno-strict-aliasing>
 )
 
 execute_process(
@@ -63,27 +46,17 @@ target_include_directories(${TARGET_NAME} PUBLIC
 
 target_link_directories(${TARGET_NAME} PUBLIC
     ${ALL_LIB_DIR}
-    $<$<CXX_COMPILER_ID:MSVC>:${Python_LIBRARY_DIRS}>
 )
 target_link_libraries(${TARGET_NAME}
     ${ALL_LIB}
     ${ALL_EXT_LINK}
-    # pyconfig.py forces linking against pythonXY.lib on MSVC
-    $<$<CXX_COMPILER_ID:MSVC>:${Python_LIBRARIES}>
-    $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:MSVC>>:/DEBUG>
 )
 
 target_compile_definitions(${TARGET_NAME} PUBLIC
     ${ALL_DEF}
     _PYMOL_LIBPNG
     _PYMOL_FREETYPE
     _PYMOL_NUMPY
-    $<$<CXX_COMPILER_ID:MSVC>:WIN32>
-    $<$<PLATFORM_ID:Darwin>:PYMOL_CURVE_VALIDATE>
-
-    # bounds checking in STL containers
-    # if DEBUG and not Windows compiler
-    $<$<AND:$<CONFIG:Debug>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:_GLIBCXX_ASSERTIONS>
 )
 
 add_subdirectory(contrib/champ)

cmake/compiler/Clang.cmake

@@ -0,0 +1 @@
+include(compiler/GCC)

cmake/compiler/GNU.cmake

@@ -0,0 +1,14 @@
+target_compile_options(${TARGET_NAME} PRIVATE
+    -Werror=return-type
+    -Wunused-variable
+    -Wno-switch
+    -Wno-narrowing
+    -Wno-char-subscripts
+    $<$<CONFIG:Debug>:-Og>
+    $<$<NOT:$<CONFIG:Debug>>:-O3>
+)
+
+target_compile_definitions(${TARGET_NAME} PUBLIC
+    # bounds checking in STL containers
+    $<$<CONFIG:Debug>:_GLIBCXX_ASSERTIONS>
+)

cmake/compiler/MSVC.cmake

@@ -0,0 +1,10 @@
+target_compile_options(${TARGET_NAME} PRIVATE
+    /MP
+    /std:c++17
+    $<$<CONFIG:Debug>:/Z7>
+)
+
+target_link_libraries(${TARGET_NAME}
+    # pyconfig.py forces linking against pythonXY.lib on MSVC
+    $<$<CONFIG:Debug>:/DEBUG>
+)

cmake/platform/Darwin.cmake

@@ -0,0 +1,13 @@
+target_link_options(${TARGET_NAME} PRIVATE
+    LINKER:-undefined,dynamic_lookup
+)
+
+target_compile_options(${TARGET_NAME} PRIVATE
+    # optimization currently causes a clang segfault on OS X 10.9 when
+    # compiling layer2/RepCylBond.cpp
+    -fno-strict-aliasing
+)
+
+target_compile_definitions(${TARGET_NAME} PUBLIC
+    PYMOL_CURVE_VALIDATE
+)

cmake/platform/Windows.cmake

@@ -0,0 +1,12 @@
+target_compile_definitions(${TARGET_NAME} PUBLIC
+    WIN32
+)
+
+target_link_directories(${TARGET_NAME} PUBLIC
+    ${Python_LIBRARY_DIRS}
+)
+
+target_link_libraries(${TARGET_NAME}
+    ${Python_LIBRARIES}
+)
+