Revision: 74274
http://sourceforge.net/p/brlcad/code/74274
Author: d_rossberg
Date: 2019-10-31 16:27:35 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
tweaks for current MS Visual Studio (2019) and CMake (same as in the main
(brlcad/trunk) branch)
Modified Paths:
--------------
rt^3/trunk/CMakeLists.txt
rt^3/trunk/src/embeddedLua/CMakeLists.txt
Modified: rt^3/trunk/CMakeLists.txt
===================================================================
--- rt^3/trunk/CMakeLists.txt 2019-10-31 16:08:31 UTC (rev 74273)
+++ rt^3/trunk/CMakeLists.txt 2019-10-31 16:27:35 UTC (rev 74274)
@@ -19,11 +19,7 @@
# information.
#
-CMAKE_MINIMUM_REQUIRED(VERSION 2.2)
-IF(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
- CMAKE_POLICY(SET CMP0007 OLD)
-ENDIF(COMMAND CMAKE_POLICY)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1.3)
PROJECT(RT3)
@@ -139,10 +135,6 @@
${RT3_SOURCE_DIR}/include
)
-# Add debugging flag for now
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-
# Tests
ENABLE_TESTING()
Modified: rt^3/trunk/src/embeddedLua/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/embeddedLua/CMakeLists.txt 2019-10-31 16:08:31 UTC (rev
74273)
+++ rt^3/trunk/src/embeddedLua/CMakeLists.txt 2019-10-31 16:27:35 UTC (rev
74274)
@@ -75,7 +75,6 @@
../other/lua/src/linit.c
)
-add_definitions(-DLUA_USER_H=\\\"writestring.h\\\")
add_definitions(-Dlua_writestring=brlcad_writestring)
add_definitions(-Dlua_writeline=brlcad_writeline)
add_definitions(-Dlua_writestringerror=brlcad_writestringerror)
@@ -83,7 +82,9 @@
IF(MSVC)
add_definitions("-DBRLCAD_COREINTERFACE_EXPORT=__declspec(dllimport)")
add_definitions("-DBRLCAD_EMBEDDEDLUA_EXPORT=__declspec(dllexport)")
- add_definitions("-Dsnprintf=_snprintf")
+ add_definitions(-DLUA_USER_H="writestring.h")
+else(MSVC)
+ add_definitions(-DLUA_USER_H=\\\"writestring.h\\\")
ENDIF(MSVC)
IF(BUILD_SHARED_LIBS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
