Browse Source

# CMake, samples and tools can now be switched on/off independently.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1227 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 13 years ago
parent
commit
5aeed46a25
1 changed files with 11 additions and 2 deletions
  1. 11 2
      CMakeLists.txt

+ 11 - 2
CMakeLists.txt

@@ -137,12 +137,21 @@ SET ( BUILD_ASSIMP_TOOLS ON CACHE BOOL
 IF ( BUILD_ASSIMP_TOOLS )
 IF ( BUILD_ASSIMP_TOOLS )
 	IF ( WIN32 )
 	IF ( WIN32 )
 		ADD_SUBDIRECTORY( tools/assimp_view/ )
 		ADD_SUBDIRECTORY( tools/assimp_view/ )
-		ADD_SUBDIRECTORY( samples/SimpleTexturedOpenGL/ )
 	ENDIF ( WIN32 )
 	ENDIF ( WIN32 )
 	ADD_SUBDIRECTORY( tools/assimp_cmd/ )
 	ADD_SUBDIRECTORY( tools/assimp_cmd/ )
-	ADD_SUBDIRECTORY( samples/SimpleOpenGL/ )
 ENDIF ( BUILD_ASSIMP_TOOLS )
 ENDIF ( BUILD_ASSIMP_TOOLS )
 
 
+SET ( BUILD_ASSIMP_SAMPLES ON CACHE BOOL
+	"If the official samples are built as well (needs Glut)."
+)
+
+IF ( BUILD_ASSIMP_SAMPLES)
+	IF ( WIN32 )
+		ADD_SUBDIRECTORY( samples/SimpleTexturedOpenGL/ )
+	ENDIF ( WIN32 )
+	ADD_SUBDIRECTORY( samples/SimpleOpenGL/ )
+ENDIF ( BUILD_ASSIMP_SAMPLES )
+
 SET ( BUILD_TESTS OFF CACHE BOOL
 SET ( BUILD_TESTS OFF CACHE BOOL
 	"If the test suite for Assimp is built in addition to the library."
 	"If the test suite for Assimp is built in addition to the library."
 )
 )