Commit a9549d09 authored by Jussi Lindgren's avatar Jussi Lindgren

Build: Removed the subproject specific platform settings

parent a7df9da4
......@@ -50,12 +50,12 @@ IF(UNIX)
ENDIF(UNIX)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -52,12 +52,12 @@ IF(UNIX)
ENDIF(UNIX)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -47,12 +47,12 @@ IF(UNIX)
ENDIF(UNIX)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -22,12 +22,12 @@ INCLUDE("FindOpenViBEModuleSystem")
INCLUDE("FindThirdPartyGTK")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -26,12 +26,12 @@ INCLUDE("FindThirdPartyBoost_Thread")
INCLUDE("FindThirdPartyBoost_Regex")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -40,12 +40,12 @@ IF(UNIX)
ENDIF(UNIX)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -14,12 +14,12 @@ INCLUDE("FindThirdPartyBoost")
INCLUDE("FindThirdPartyBoost_Thread")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -15,15 +15,15 @@ INCLUDE("FindThirdPartyBoost_System")
INCLUDE("FindThirdPartyPThread") # for ubuntu
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
IF(WIN32)
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) # for boost::asio
ENDIF(WIN32)
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -20,12 +20,12 @@ INCLUDE("FindThirdPartyVRPN")
INCLUDE("FindThirdPartyPThread") # needed on Linux for VRPN
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -20,12 +20,12 @@ INCLUDE("FindThirdPartyVRPN")
INCLUDE("FindThirdPartyPThread") # needed on Linux for VRPN
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# ----------------------
# Generate launch script
......
......@@ -13,15 +13,15 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
# We call this first as some dependency getters have been coded to not find the libs on x64 until supported
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
IF(WIN32)
ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
ENDIF(WIN32)
SET_BUILD_PLATFORM()
INCLUDE("FindOpenViBEContributions")
......
......@@ -16,12 +16,12 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${source_files})
INCLUDE("FindThirdPartyPython")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
if(WIN32)
add_definitions("-DWIN32")
endif()
......
......@@ -9,10 +9,10 @@ FILE(GLOB_RECURSE source_files src/*.cpp src/*.h src/*.inl)
ADD_EXECUTABLE(openvibe-stimulation-generator ${source_files})
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
IF(WIN32)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
......
......@@ -20,12 +20,12 @@ INCLUDE("FindOpenViBEModuleSystem")
INCLUDE("FindThirdPartyBoost")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -13,12 +13,12 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
COMPILE_FLAGS "-DOVP_Exports -DOVP_Shared")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
INCLUDE("FindOpenViBE")
INCLUDE("FindOpenViBECommon")
......
......@@ -13,12 +13,12 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
COMPILE_FLAGS "-DOVP_Exports -DOVP_Shared")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
INCLUDE("FindOpenViBE")
INCLUDE("FindOpenViBECommon")
......
......@@ -21,12 +21,12 @@ INCLUDE("FindThirdPartyBoost")
INCLUDE("FindThirdPartyPython")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -14,12 +14,12 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
COMPILE_FLAGS "-DOVP_Exports -DOVP_Shared")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
INCLUDE("FindOpenViBE")
INCLUDE("FindOpenViBECommon")
......
......@@ -16,7 +16,7 @@ INCLUDE("FindThirdPartyBoost")
INCLUDE("FindThirdPartyBoost_System")
INCLUDE("FindThirdPartyBoost_Thread")
SET_BUILD_PLATFORM()
# Unfortunately we need to install the tests as any application to find .dll/.so files
# on both Windows and Linux.
......
......@@ -7,12 +7,12 @@ SET(PROJECT_VERSION_PATCH ${OV_GLOBAL_VERSION_PATCH})
SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
if(NOT(CMAKE_BUILD_TYPE) AND CMAKE_GENERATOR MATCHES "Visual Studio*")
set(MULTI_BUILD TRUE)
......
......@@ -23,12 +23,12 @@ INCLUDE("FindThirdPartyBoost_System") # ASIO
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -20,12 +20,12 @@ INCLUDE("FindOpenViBEModuleSocket")
INCLUDE("FindOpenViBEModuleSystem")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -30,12 +30,12 @@ IF(OV_COMPILE_TESTS)
ENDIF(OV_COMPILE_TESTS)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -20,12 +20,12 @@ INCLUDE("FindOpenViBEModuleSystem")
INCLUDE("FindOpenViBEModuleXML")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -19,12 +19,12 @@ INCLUDE("FindOpenViBEModuleEBML")
INCLUDE("FindOpenViBEModuleSystem")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -29,12 +29,12 @@ IF(OV_COMPILE_TESTS)
ENDIF(OV_COMPILE_TESTS)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -22,12 +22,12 @@ INCLUDE("FindThirdPartyGTK")
INCLUDE("FindOpenViBEVisualizationToolkit")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -23,12 +23,12 @@ INCLUDE("FindThirdPartyBoost")
INCLUDE("FindThirdPartyBoost_Regex")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -34,12 +34,12 @@ INCLUDE("FindOpenViBEModuleFS")
INCLUDE("FindThirdPartyMatlab")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -13,15 +13,15 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
COMPILE_FLAGS "-DOVP_Exports -DOVP_Shared")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
IF(WIN32)
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) # for boost::asio
ENDIF(WIN32)
SET_BUILD_PLATFORM()
INCLUDE("FindOpenViBE")
INCLUDE("FindOpenViBECommon")
......
......@@ -17,12 +17,12 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
INCLUDE_DIRECTORIES("../../../contrib/packages/wavelet2d")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
INCLUDE("FindOpenViBE")
INCLUDE("FindOpenViBECommon")
......
......@@ -30,12 +30,12 @@ INCLUDE("FindOpenViBEVisualizationToolkit")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -43,12 +43,12 @@ IF(WIN32)
ENDIF(WIN32)
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -18,12 +18,12 @@ INCLUDE("FindOpenViBEToolkit")
INCLUDE("FindOpenViBEModuleSystem")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -20,12 +20,12 @@ INCLUDE("FindOpenViBEModuleSystem")
INCLUDE("FindOpenViBEModuleXML")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -22,12 +22,12 @@ INCLUDE("FindThirdPartyGTK")
INCLUDE("FindThirdPartyX11")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
......
......@@ -27,12 +27,12 @@ INCLUDE("FindOpenViBEModuleSystem")
INCLUDE("FindThirdPartyVRPN")
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
SET_BUILD_PLATFORM()
# -----------------------------
# Install files
# -----------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment