CMakeList: Sandbag Mac specific things, and be strict with quoting

CMakeLists.txt

@@ -4,17 +4,17 @@ cmake_minimum_required(VERSION 3.3)
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
+if(APPLE)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mavx -msse -msse2 -msse3 -msse4")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
 SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version")
-
-
-project (fluid_decomposition_supercollider LANGUAGES CXX)
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
+endif()
 
+project (fluid_decomposition_supercollider LANGUAGES CXX)
 
 option(SUPERNOVA "Build plugins for supernova" OFF)
 
@@ -30,11 +30,11 @@ MACRO(SUBDIRLIST result curdir)
 ENDMACRO()
 
 set(FLUID_PATH ~/fluid_decomposition CACHE PATH "The top level of the fluid_decomposition repo")
-set(LOCAL_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set(LOCAL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 
-get_filename_component(FLUID_ABS_PATH ${FLUID_PATH} ABSOLUTE)
+get_filename_component(FLUID_ABS_PATH "${FLUID_PATH}" ABSOLUTE)
-message(${FLUID_ABS_PATH})
+message("${FLUID_ABS_PATH}")
 # if (NOT DEFINED ${FLUID_DECOMP_PATH})
 # 	message(FATAL_ERROR "Please set the path to the fluid_decomposition sources with -DFLUID_DECOMP_PATH=<path>")
 # endif()
@@ -43,11 +43,11 @@ if (NOT (EXISTS "${FLUID_ABS_PATH}/build/fluid_decomposition-exports.cmake"))
 	message(FATAL_ERROR "Can't find the fluid_decomposition CMake targets file at ${FLUID_ABS_PATH}/build/fluid_decomposition-expors.cmake. Please go to ${FLUID_ABS_PATH}/build and run CMake")
 endif()
 
-if (NOT (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/))
+if (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/"))
-	file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/)
+	file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/")
 endif()
 
-file(COPY ${FLUID_ABS_PATH}/AudioFiles/ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/)
+file(COPY "${FLUID_ABS_PATH}/AudioFiles/" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/")
 
 
 include("${FLUID_ABS_PATH}/build/fluid_decomposition-exports.cmake")
@@ -64,14 +64,14 @@ endif()
 add_library(FLUID_SC_WRAPPER INTERFACE)
 target_sources(FLUID_SC_WRAPPER
 INTERFACE
-${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp
+"${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp"
-${CMAKE_CURRENT_SOURCE_DIR}/include/SCBufferAdaptor.hpp
+"${CMAKE_CURRENT_SOURCE_DIR}/include/SCBufferAdaptor.hpp"
 )
 
-SUBDIRLIST(PROJECT_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src)
+SUBDIRLIST(PROJECT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
 foreach (project_dir ${PROJECT_DIRS})
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/${project_dir}/CMakeLists.txt")
 		message("Generating: ${project_dir}")
-		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/${project_dir})
+		add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/${project_dir}")
 	endif ()
 endforeach ()

scripts/target_post.cmake

@@ -11,23 +11,23 @@ target_include_directories(
   PRIVATE
   ${LOCAL_INCLUDES}
   SYSTEM PRIVATE
-  ${SC_PATH}/include/plugin_interface
+  "${SC_PATH}/include/plugin_interface"
-  ${SC_PATH}/include/common
+  "${SC_PATH}/include/common"
-  ${SC_PATH}/common
+  "${SC_PATH}/common"
-  ${SC_PATH}/external_libraries/boost #we need boost::align for deallocating buffer memory :-(
+  "${SC_PATH}/external_libraries/boost" #we need boost::align for deallocating buffer memory :-(
 )
 
 get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES)
-source_group(TREE ${FLUID_PATH}/include FILES ${HEADERS})
+source_group(TREE "${FLUID_PATH}/include" FILES ${HEADERS})
 
 
 if (SUPERNOVA)
     target_include_directories(
       ${PLUGIN}
       SYSTEM PRIVATE
-      ${SC_PATH}/external_libraries/nova-tt
+      "${SC_PATH}/external_libraries/nova-tt"
-      ${SC_PATH}/external_libraries/boost_lockfree
+      "${SC_PATH}/external_libraries/boost_lockfree"
-      ${SC_PATH}/external_libraries/boost-lockfree
+      "${SC_PATH}/external_libraries/boost-lockfree"
     )
 endif()