Saner cmake files

CMakeLists.txt

@@ -15,8 +15,23 @@ configure_file (
     "${PROJECT_SOURCE_DIR}/cmake/Config.h.in"
     "${PROJECT_BINARY_DIR}/Config.h"
 )
+
+# Include directories
+include_directories ("${PROJECT_SOURCE_DIR}/include")
 include_directories ("${PROJECT_BINARY_DIR}")
 
+# Include External Modules
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
+# Build warnings
+set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
+set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
+set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
+set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
+set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
+
+set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
+
 # Add subdirectories
 add_subdirectory (src)
 add_subdirectory (test)

src/CMakeLists.txt

@@ -48,6 +48,24 @@ endif (APPLE)
 
 #################################################################
 
+# Flags for all builds
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
+
+# Flags for Debug build
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
+
+# Flags for Releasae builds
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer -O2")
+
+# Apply Flags
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_DEBUG}")
+set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_RELEASE}")
+
 # Add utils directory
 add_subdirectory (utils)
 
@@ -57,30 +75,32 @@ add_executable (OpenRaider MACOSX_BUNDLE ${SRCS})
 #################################################################
 
 if (APPLE)
-    # Copy setup script
-    add_custom_command (TARGET OpenRaider POST_BUILD
-        COMMAND echo "Injecting setup script..."
-        COMMAND cp "${PROJECT_SOURCE_DIR}/cmake/setup_mac.sh" "${PROJECT_BINARY_DIR}/src/OpenRaider.app/Contents/MacOS/OpenRaider.sh"
-    )
-
-    # Fix executable name, so setup script will be called
-    add_custom_command (TARGET OpenRaider POST_BUILD
-        COMMAND echo "Changing executable name..."
-        COMMAND /usr/libexec/PlistBuddy -c "Set :CFBundleExecutable OpenRaider.sh" Info.plist
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/src/OpenRaider.app/Contents
-    )
-
-    # Preparing the bundle on install
-    # http://www.cmake.org/Wiki/BundleUtilitiesExample
-    set (plugin_dest_dir OpenRaider.app/Contents/MacOS)
-    set (APPS "${PROJECT_BINARY_DIR}/src/OpenRaider.app")
-    install (CODE "
-        file(GLOB_RECURSE PLUGINS
-            \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
-        include(BundleUtilities)
-        fixup_bundle(\"${APPS}\" \"\${PLUGINS}\" \"\")
-        " COMPONENT Runtime
-    )
+    if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+        # Copy setup script
+        add_custom_command (TARGET OpenRaider POST_BUILD
+            COMMAND echo "Injecting setup script..."
+            COMMAND cp "${PROJECT_SOURCE_DIR}/cmake/setup_mac.sh" "${PROJECT_BINARY_DIR}/src/OpenRaider.app/Contents/MacOS/OpenRaider.sh"
+        )
+
+        # Fix executable name, so setup script will be called
+        add_custom_command (TARGET OpenRaider POST_BUILD
+            COMMAND echo "Changing executable name..."
+            COMMAND /usr/libexec/PlistBuddy -c "Set :CFBundleExecutable OpenRaider.sh" Info.plist
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/src/OpenRaider.app/Contents
+        )
+
+        # Preparing the bundle on install
+        # http://www.cmake.org/Wiki/BundleUtilitiesExample
+        set (plugin_dest_dir OpenRaider.app/Contents/MacOS)
+        set (APPS "${PROJECT_BINARY_DIR}/src/OpenRaider.app")
+        install (CODE "
+            file(GLOB_RECURSE PLUGINS
+                \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+            include(BundleUtilities)
+            fixup_bundle(\"${APPS}\" \"\${PLUGINS}\" \"\")
+            " COMPONENT Runtime
+        )
+    endif (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 endif (APPLE)
 
 #################################################################
@@ -94,41 +114,6 @@ endif (NOT APPLE)
 
 #################################################################
 
-# Debug build warnings
-set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
-set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
-set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
-set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
-set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
-
-set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
-
-# Flags for all builds
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
-
-# Flags for Debug build
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0 ${WARNINGS}")
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
-
-# Flags for Releasae builds
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer -O2")
-
-# Apply Flags
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_DEBUG}")
-set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_RELEASE}")
-
-# Include directory
-include_directories ("${PROJECT_SOURCE_DIR}/include")
-
-# Include External Modules
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
-#################################################################
-
 # Add Math Library
 set (LIBS ${LIBS} m)
 

test/CMakeLists.txt

@@ -4,15 +4,6 @@ include_directories ("${PROJECT_SOURCE_DIR}/include")
 # Include External Modules
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
-# Warnings
-set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
-set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
-set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
-set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
-set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
-
-set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
-
 # Flags for all builds
 set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
 set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -g -O0 ${WARNINGS}")