Rename tinysplinecpp to tinysplinecxx.

msteinbeck · Apr 13, 2020 · 85df516 · 85df516
1 parent 319b6b6
commit 85df516
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 31 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(c)
-add_subdirectory(cpp)
+add_subdirectory(cxx)
diff --git a/examples/cpp/CMakeLists.txt → examples/cxx/CMakeLists.txt b/examples/cpp/CMakeLists.txt → examples/cxx/CMakeLists.txt
@@ -1,16 +1,16 @@
 ###############################################################################
 ### Create examples.
 ###############################################################################
-if(TARGET tinysplinecpp_static)
+if(TARGET tinysplinecxx_static)
 	add_executable(quickstart quickstart.cpp)
 	target_link_libraries(quickstart
-			LINK_PUBLIC tinysplinecpp_static
+			LINK_PUBLIC tinysplinecxx_static
 			${TINYSPLINE_CXX_STATIC_LIBRARIES})
 	set_target_properties(quickstart PROPERTIES FOLDER "examples/cpp")
 
 	add_executable(time_series time_series.cpp)
 	target_link_libraries(time_series
-			LINK_PUBLIC tinysplinecpp_static
+			LINK_PUBLIC tinysplinecxx_static
 			${TINYSPLINE_CXX_STATIC_LIBRARIES})
 	set_target_properties(time_series PROPERTIES FOLDER "examples/cpp")
 endif()
diff --git a/examples/cpp/quickstart.cpp → examples/cxx/quickstart.cpp b/examples/cpp/quickstart.cpp → examples/cxx/quickstart.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "tinysplinecpp.h"
+#include "tinysplinecxx.h"
 
 int main(int argc, char **argv)
 {

diff --git a/examples/cpp/time_series.cpp → examples/cxx/time_series.cpp b/examples/cpp/time_series.cpp → examples/cxx/time_series.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "tinysplinecpp.h"
+#include "tinysplinecxx.h"
 
 int main(int argc, char **argv)
 {
@@ -42,4 +42,4 @@ int main(int argc, char **argv)
 	std::vector<tinyspline::real> result = net.result();
 	std::cout << "t = " << result[0] << ", p = (" << result[1] << ", "
 			<< result[2] << ", " << result[3] << ")" << std::endl;
-}
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -267,7 +267,7 @@ set(TINYSPLINE_PLATFORM
 #   CMake build target of binding ***.
 ###############################################################################
 set(TINYSPLINE_C_LIBRARIES_OUTPUT_NAME "tinyspline")
-set(TINYSPLINE_CXX_LIBRARIES_OUTPUT_NAME "tinysplinecpp")
+set(TINYSPLINE_CXX_LIBRARIES_OUTPUT_NAME "tinysplinecxx")
 set(TINYSPLINE_CSHARP_CMAKE_TARGET "tinysplinecsharp" CACHE INTERNAL "")
 set(TINYSPLINE_DLANG_CMAKE_TARGET "tinysplinedlang" CACHE INTERNAL "")
 set(TINYSPLINE_GO_CMAKE_TARGET "tinysplinego" CACHE INTERNAL "")
@@ -743,7 +743,7 @@ endif()
 # TINYSPLINE_CXX_SOURCE_FILES
 list(APPEND TINYSPLINE_CXX_SOURCE_FILES
 	${TINYSPLINE_C_SOURCE_FILES}
-	"${CMAKE_CURRENT_SOURCE_DIR}/tinysplinecpp.cpp")
+	"${CMAKE_CURRENT_SOURCE_DIR}/tinysplinecxx.cxx")
 if(TINYSPLINE_HAS_PARENT)
 	set(TINYSPLINE_CXX_SOURCE_FILES ${TINYSPLINE_CXX_SOURCE_FILES} PARENT_SCOPE)
 else()
@@ -799,48 +799,48 @@ install(FILES ${CMAKE_BINARY_DIR}/src/tinyspline.pc
 
 # C++ library
 if(TINYSPLINE_ENABLE_CXX)
-	add_library(tinysplinecpp_shared SHARED ${TINYSPLINE_CXX_SOURCE_FILES})
-	set_target_properties(tinysplinecpp_shared PROPERTIES
+	add_library(tinysplinecxx_shared SHARED ${TINYSPLINE_CXX_SOURCE_FILES})
+	set_target_properties(tinysplinecxx_shared PROPERTIES
 		OUTPUT_NAME "${TINYSPLINE_CXX_LIBRARIES_OUTPUT_NAME}"
 		DEBUG_POSTFIX "${TINYSPLINE_DEBUG_POSTFIX}"
 		COMPILE_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS}")
-	install(TARGETS tinysplinecpp_shared
+	install(TARGETS tinysplinecxx_shared
 		LIBRARY DESTINATION ${TINYSPLINE_INSTALL_LIBRARY_DIR}
 		ARCHIVE DESTINATION ${TINYSPLINE_INSTALL_LIBRARY_DIR}
 		RUNTIME DESTINATION ${TINYSPLINE_INSTALL_LIBRARY_DIR})
-	target_include_directories(tinysplinecpp_shared
+	target_include_directories(tinysplinecxx_shared
 			PUBLIC ${TINYSPLINE_CXX_INCLUDE_DIR})
-	add_library(tinysplinecpp_static STATIC ${TINYSPLINE_CXX_SOURCE_FILES})
-	set_target_properties(tinysplinecpp_static PROPERTIES
+	add_library(tinysplinecxx_static STATIC ${TINYSPLINE_CXX_SOURCE_FILES})
+	set_target_properties(tinysplinecxx_static PROPERTIES
 		OUTPUT_NAME "${TINYSPLINE_CXX_LIBRARIES_OUTPUT_NAME}"
 		DEBUG_POSTFIX "${TINYSPLINE_DEBUG_POSTFIX}"
 		PREFIX "lib"
 		COMPILE_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS}")
-	install(TARGETS tinysplinecpp_static
+	install(TARGETS tinysplinecxx_static
 		LIBRARY DESTINATION ${TINYSPLINE_INSTALL_LIBRARY_DIR}
 		ARCHIVE DESTINATION ${TINYSPLINE_INSTALL_LIBRARY_DIR})
-	target_include_directories(tinysplinecpp_static
+	target_include_directories(tinysplinecxx_static
 		PUBLIC ${TINYSPLINE_CXX_INCLUDE_DIR})
-	install(FILES tinysplinecpp.h
+	install(FILES tinysplinecxx.h
 		DESTINATION ${TINYSPLINE_INSTALL_INCLUDE_DIR})
 	configure_package_config_file(
-		"${CMAKE_CURRENT_SOURCE_DIR}/pkg/tinysplinecpp-config.cmake.in"
-		"tinysplinecpp-config.cmake"
+		"${CMAKE_CURRENT_SOURCE_DIR}/pkg/tinysplinecxx-config.cmake.in"
+		"tinysplinecxx-config.cmake"
 		INSTALL_DESTINATION "${TINYSPLINE_INSTALL_CMAKE_CONFIG_DIR}"
 		PATH_VARS
 			TINYSPLINE_INSTALL_INCLUDE_DIR
 			TINYSPLINE_INSTALL_LIBRARY_DIR)
 	write_basic_package_version_file(
-		"tinysplinecpp-config-version.cmake"
+		"tinysplinecxx-config-version.cmake"
 		VERSION ${TINYSPLINE_VERSION}
 		COMPATIBILITY ExactVersion)
 	install(FILES
-		"${CMAKE_CURRENT_BINARY_DIR}/tinysplinecpp-config.cmake"
-		"${CMAKE_CURRENT_BINARY_DIR}/tinysplinecpp-config-version.cmake"
+		"${CMAKE_CURRENT_BINARY_DIR}/tinysplinecxx-config.cmake"
+		"${CMAKE_CURRENT_BINARY_DIR}/tinysplinecxx-config-version.cmake"
 		DESTINATION ${TINYSPLINE_INSTALL_CMAKE_CONFIG_DIR})
-	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkg/tinysplinecpp.pc.in"
-		"tinysplinecpp.pc" @ONLY)
-	install(FILES ${CMAKE_BINARY_DIR}/src/tinysplinecpp.pc
+	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkg/tinysplinecxx.pc.in"
+		"tinysplinecxx.pc" @ONLY)
+	install(FILES ${CMAKE_BINARY_DIR}/src/tinysplinecxx.pc
 		DESTINATION ${TINYSPLINE_INSTALL_PKGCONFIG_DIR})
 endif()
 

diff --git a/src/pkg/tinyspline.pc.in b/src/pkg/tinyspline.pc.in
@@ -7,6 +7,6 @@ Name: @TINYSPLINE_PACKAGE_NAME@
 Description: @TINYSPLINE_SUMMARY@
 Version: @TINYSPLINE_VERSION@
 
-Libs: -L${libdir} -ltinyspline
+Libs: -L${libdir} -l@TINYSPLINE_C_LIBRARIES_OUTPUT_NAME@
 Libs.private: @TINYSPLINE_C_STATIC_LIBRARIES@
 Cflags: -I${includedir} @TINYSPLINE_PKGCONFIG_C_FLAGS@
diff --git a/src/pkg/tinysplinecpp-config.cmake.in → src/pkg/tinysplinecxx-config.cmake.in b/src/pkg/tinysplinecpp-config.cmake.in → src/pkg/tinysplinecxx-config.cmake.in
diff --git a/src/pkg/tinysplinecpp.pc.in → src/pkg/tinysplinecxx.pc.in b/src/pkg/tinysplinecpp.pc.in → src/pkg/tinysplinecxx.pc.in
@@ -7,6 +7,6 @@ Name: @TINYSPLINE_PACKAGE_NAME@
 Description: @TINYSPLINE_SUMMARY@
 Version: @TINYSPLINE_VERSION@
 
-Libs: -L${libdir} -ltinysplinecpp
+Libs: -L${libdir} -l@TINYSPLINE_CXX_LIBRARIES_OUTPUT_NAME@
 Libs.private: @TINYSPLINE_CXX_STATIC_LIBRARIES@
 Cflags: -I${includedir} @TINYSPLINE_PKGCONFIG_CXX_FLAGS@
diff --git a/src/swig/tinyspline.i b/src/swig/tinyspline.i
@@ -109,11 +109,11 @@
 
 %{
 	#include "tinyspline.h"
-	#include "tinysplinecpp.h"
+	#include "tinysplinecxx.h"
 %}
 
 %include "tinyspline.h"
-%include "tinysplinecpp.h"
+%include "tinysplinecxx.h"
 
 // Make std::vector<tinyspline::real> available in target language. Is also required by
 // '%attributeval' (see above).

diff --git a/src/tinysplinecpp.cpp → src/tinysplinecxx.cxx b/src/tinysplinecpp.cpp → src/tinysplinecxx.cxx
@@ -1,4 +1,4 @@
-#include "tinysplinecpp.h"
+#include "tinysplinecxx.h"
 #include <stdlib.h>
 #include <stdexcept>
 #include <cstdio>

diff --git a/src/tinysplinecpp.h → src/tinysplinecxx.h b/src/tinysplinecpp.h → src/tinysplinecxx.h