Skip to content

Commit 00092d0

Browse files
mpictormpictor
committed
cmake: rename BRL-CAD variables, remove unused variable, rename CMake/ to cmake/
1 parent 1bb0fd4 commit 00092d0

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# C M A K E L I S T S . T X T
2-
# SCL
1+
# C M A K E L I S T S . T X T F O R S C L
32
#
4-
# Copyright (c) 2010 United States Government as represented by
5-
# the U.S. Army Research Laboratory.
3+
# This file is Copyright (c) 2010 United States Government as
4+
# represented by the U.S. Army Research Laboratory.
65
#
76
# Redistribution and use in source and binary forms, with or without
87
# modification, are permitted provided that the following conditions
@@ -33,11 +32,11 @@
3332
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3433

3534
# *******************************************************************
36-
# *** BRL-CAD's CMakeLists.txt ***
35+
# *** SCL's CMakeLists.txt ***
3736
# *******************************************************************
3837

3938
# This file contains the top level CMakeLists.txt logic for the
40-
# BRL-CAD software package.
39+
# SCL software package.
4140

4241
# Minimum required version of CMake
4342
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
@@ -67,7 +66,7 @@ SET(SCL_VERSION "${SCL_VERSION_MAJOR}.${SCL_VERSION_MINOR}.${SCL_VERSION_PATCH}"
6766

6867
# CMake derives much of its functionality from modules, typically
6968
# stored in one directory - let CMake know where to find them.
70-
SET(SCL_CMAKE_DIR "${SCL_SOURCE_DIR}/CMake")
69+
SET(SCL_CMAKE_DIR "${SCL_SOURCE_DIR}/cmake")
7170
SET(CMAKE_MODULE_PATH "${SCL_CMAKE_DIR};${CMAKE_MODULE_PATH}")
7271

7372
INCLUDE(${SCL_CMAKE_DIR}/SCL_Utils.cmake)
@@ -156,11 +155,10 @@ ENDFOREACH()
156155
#-----------------------------------------------------------------------------
157156
# Configure install locations.
158157

159-
# The location in which to install BRLCAD. Need a good Debug location
158+
# The location in which to install SCL. Need a good Debug location
160159
# for Windows. Only do this if CMAKE_INSTALL_PREFIX hasn't been set
161160
# already, to try and allow parent builds (if any) some control.
162161
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
163-
MESSAGE("HAVE_DEFAULT_PREFIX")
164162
IF(NOT WIN32)
165163
IF ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
166164
SET(CMAKE_INSTALL_PREFIX "/usr")
@@ -174,7 +172,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
174172
SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "SCL install prefix" FORCE)
175173
SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 0)
176174
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
177-
SET(BRLCAD_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "SCL install prefix")
178175

179176
OPTION(SCL-BUILD_EXPRESS_ONLY "Only build express parser." OFF)
180177
MARK_AS_ADVANCED(SCL-BUILD_EXPRESS_ONLY)

CMake/CheckCFileRuns.cmake renamed to cmake/CheckCFileRuns.cmake

File renamed without changes.

CMake/FindLEX.cmake renamed to cmake/FindLEX.cmake

File renamed without changes.

CMake/FindYACC.cmake renamed to cmake/FindYACC.cmake

File renamed without changes.

CMake/SCL_Utils.cmake renamed to cmake/SCL_Utils.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ MACRO(SCL_ADDEXEC execname srcs libs)
1919
# Enable extra compiler flags if local executables and/or global options dictate
2020
SET(LOCAL_COMPILE_FLAGS "")
2121
FOREACH(extraarg ${ARGN})
22-
IF(${extraarg} MATCHES "STRICT" AND BRLCAD-ENABLE_STRICT)
22+
IF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
2323
SET(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
24-
ENDIF(${extraarg} MATCHES "STRICT" AND BRLCAD-ENABLE_STRICT)
24+
ENDIF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
2525
ENDFOREACH(extraarg ${ARGN})
2626
IF(LOCAL_COMPILE_FLAGS)
2727
SET_TARGET_PROPERTIES(${execname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
@@ -60,9 +60,9 @@ MACRO(SCL_ADDLIB libname srcs libs)
6060
# Enable extra compiler flags if local libraries and/or global options dictate
6161
SET(LOCAL_COMPILE_FLAGS "")
6262
FOREACH(extraarg ${ARGN})
63-
IF(${extraarg} MATCHES "STRICT" AND BRLCAD-ENABLE_STRICT)
63+
IF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
6464
SET(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
65-
ENDIF(${extraarg} MATCHES "STRICT" AND BRLCAD-ENABLE_STRICT)
65+
ENDIF(${extraarg} MATCHES "STRICT" AND SCL-ENABLE_STRICT)
6666
ENDFOREACH(extraarg ${ARGN})
6767
IF(LOCAL_COMPILE_FLAGS)
6868
IF(BUILD_SHARED_LIBS)

CMake/test_srcs/sys_wait_test.c renamed to cmake/test_srcs/sys_wait_test.c

File renamed without changes.

0 commit comments

Comments
 (0)