From 8d14ccb505b272bfd26f0f77c832bdec9714adc3 Mon Sep 17 00:00:00 2001
From: torcs-ng <torcs-ng@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Sat, 23 Feb 2013 13:23:31 +0000
Subject: [PATCH] update CMakeLists.txt for build with internal FreeSOLID

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5178 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5bd2e921f42f16f9dc279991e2b062024433749d
Former-commit-id: 5df71f719df8ef2d7c0dbe528c1ba7e2c176c36e
---
 src/modules/simu/simuv4/CMakeLists.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/simu/simuv4/CMakeLists.txt b/src/modules/simu/simuv4/CMakeLists.txt
index 4cee79804..3a9edd3f8 100644
--- a/src/modules/simu/simuv4/CMakeLists.txt
+++ b/src/modules/simu/simuv4/CMakeLists.txt
@@ -1,11 +1,12 @@
+INCLUDE("../../../../cmake/macros.cmake")
+
 IF(NOT OPTION_3RDPARTY_SOLID)
-
-	ADD_SUBDIRECTORY(SOLID-2.0)
-
+	# BEFORE in order to prevent Windows 3rdParty/include/SOLID from taking the flag.
+	INCLUDE_DIRECTORIES(BEFORE ../simuv2.1/SOLID-2.0/include)
+ELSE(NOT OPTION_3RDPARTY_SOLID)
+	ADD_SOLID_INCLUDEDIR()
 ENDIF(NOT OPTION_3RDPARTY_SOLID)
 
-INCLUDE(../../../../cmake/macros.cmake)
-
 ADD_SDLIB_INCLUDEDIR(portability)
 
 IF(WIN32)