From c66c7d7ae60859cee9d9f87fe5d7dba18a32e001 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Wed, 3 Jan 2018 17:22:07 +0100
Subject: [PATCH] remove ctest to make workspace more readable.
---
CMakeLists.txt | 2 +-
code/CMakeLists.txt | 10 +++++-----
test/CMakeLists.txt | 3 ---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd2317cca..f7ebed370 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,7 @@ OPTION ( BUILD_DOCS
OFF
)
+# Use subset of Windows.h
if (WIN32)
ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN )
endif()
@@ -203,7 +204,6 @@ IF( UNIX )
INCLUDE(GNUInstallDirs)
ENDIF( UNIX )
-
# Grouped compiler settings
IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
# hide all not-exported symbols
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 4d02240da..5b3ca6a88 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -945,8 +945,8 @@ if (APPLE)
"../${HEADER_PATH}/Compiler"
assimp.framework/Headers/Compiler
COMMENT "Copying public ./Compiler/ header files to framework bundle's Headers/Compiler/")
- endif(BUILD_FRAMEWORK)
-endif(APPLE)
+ ENDIF(BUILD_FRAMEWORK)
+ENDIF(APPLE)
# Build against external unzip, or add ../contrib/unzip so
# assimp can #include "unzip.h"
@@ -975,7 +975,7 @@ if (ASSIMP_ANDROID_JNIIOSYSTEM)
INSTALL(FILES ${HEADER_PATH}/${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/AndroidJNIIOSystem.h
DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}
COMPONENT assimp-dev)
-endif(ASSIMP_ANDROID_JNIIOSYSTEM)
+ENDIF(ASSIMP_ANDROID_JNIIOSYSTEM)
if(MSVC AND ASSIMP_INSTALL_PDB)
IF(CMAKE_GENERATOR MATCHES "^Visual Studio")
@@ -997,7 +997,7 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
CONFIGURATIONS RelWithDebInfo
)
ENDIF()
-endif ()
+ENDIF ()
if (ASSIMP_COVERALLS)
include(Coveralls)
@@ -1009,4 +1009,4 @@ if (ASSIMP_COVERALLS)
"${COVERAGE_SRCS}" # The source files.
ON # If we should upload.
"${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path.
-endif()
+ENDIF()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 741da9534..a1bb5fd35 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -38,9 +38,6 @@
#----------------------------------------------------------------------
cmake_minimum_required( VERSION 2.6 )
-include( CTest )
-enable_testing()
-
INCLUDE_DIRECTORIES(
../contrib/gtest/include
../contrib/gtest/
--
GitLab