fix: fix CMake install path issue.
- fix the wrong reference in CMake script which install lib target into wrong directory. - add file, change CMake script and modify header file for preparing develop of CKLight and CKCamera. - fix doc typo.
This commit is contained in:
parent
305c0b1b65
commit
d29d40448b
@ -53,7 +53,7 @@ endif ()
|
||||
install(EXPORT LibCmoTargets
|
||||
FILE LibCmoTargets.cmake
|
||||
NAMESPACE NeMo::
|
||||
DESTINATION ${YYCC_INSTALL_LIB_PATH}/cmake/LibCmo
|
||||
DESTINATION ${NEMO_INSTALL_LIB_PATH}/cmake/LibCmo
|
||||
)
|
||||
# Package configuration file
|
||||
include(CMakePackageConfigHelpers)
|
||||
@ -65,7 +65,7 @@ write_basic_package_version_file(
|
||||
configure_package_config_file(
|
||||
${CMAKE_CURRENT_LIST_DIR}/CMake/LibCmoConfig.cmake.in
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/LibCmoConfig.cmake"
|
||||
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibCmo
|
||||
INSTALL_DESTINATION ${NEMO_INSTALL_LIB_PATH}/cmake/LibCmo
|
||||
)
|
||||
# Copy package files to install destination
|
||||
install(
|
||||
@ -73,5 +73,5 @@ FILES
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/LibCmoConfig.cmake"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/LibCmoConfigVersion.cmake"
|
||||
DESTINATION
|
||||
${CMAKE_INSTALL_LIBDIR}/cmake/LibCmo
|
||||
${NEMO_INSTALL_LIB_PATH}/cmake/LibCmo
|
||||
)
|
||||
|
6
LibCmo/CK2/ObjImpls/CKCamera.cpp
Normal file
6
LibCmo/CK2/ObjImpls/CKCamera.cpp
Normal file
@ -0,0 +1,6 @@
|
||||
#include "CKCamera.hpp"
|
||||
#include "../CKStateChunk.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
8
LibCmo/CK2/ObjImpls/CKCamera.hpp
Normal file
8
LibCmo/CK2/ObjImpls/CKCamera.hpp
Normal file
@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../VTInternal.hpp"
|
||||
#include "CKBeObject.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
6
LibCmo/CK2/ObjImpls/CKLight.cpp
Normal file
6
LibCmo/CK2/ObjImpls/CKLight.cpp
Normal file
@ -0,0 +1,6 @@
|
||||
#include "CKLight.hpp"
|
||||
#include "../CKStateChunk.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
8
LibCmo/CK2/ObjImpls/CKLight.hpp
Normal file
8
LibCmo/CK2/ObjImpls/CKLight.hpp
Normal file
@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../VTInternal.hpp"
|
||||
#include "CKBeObject.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
6
LibCmo/CK2/ObjImpls/CKTargetCamera.cpp
Normal file
6
LibCmo/CK2/ObjImpls/CKTargetCamera.cpp
Normal file
@ -0,0 +1,6 @@
|
||||
#include "CKTargetCamera.hpp"
|
||||
#include "../CKStateChunk.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
8
LibCmo/CK2/ObjImpls/CKTargetCamera.hpp
Normal file
8
LibCmo/CK2/ObjImpls/CKTargetCamera.hpp
Normal file
@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../VTInternal.hpp"
|
||||
#include "CKBeObject.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
6
LibCmo/CK2/ObjImpls/CKTargetLight.cpp
Normal file
6
LibCmo/CK2/ObjImpls/CKTargetLight.cpp
Normal file
@ -0,0 +1,6 @@
|
||||
#include "CKTargetLight.hpp"
|
||||
#include "../CKStateChunk.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
8
LibCmo/CK2/ObjImpls/CKTargetLight.hpp
Normal file
8
LibCmo/CK2/ObjImpls/CKTargetLight.hpp
Normal file
@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../VTInternal.hpp"
|
||||
#include "CKBeObject.hpp"
|
||||
|
||||
namespace LibCmo::CK2::ObjImpls {
|
||||
|
||||
}
|
@ -30,6 +30,10 @@ PRIVATE
|
||||
CK2/ObjImpls/CKMesh.cpp
|
||||
CK2/ObjImpls/CKObject.cpp
|
||||
CK2/ObjImpls/CKTexture.cpp
|
||||
CK2/ObjImpls/CKLight.cpp
|
||||
CK2/ObjImpls/CKTargetLight.cpp
|
||||
CK2/ObjImpls/CKCamera.cpp
|
||||
CK2/ObjImpls/CKTargetCamera.cpp
|
||||
# VxMath
|
||||
VxMath/VxMemoryMappedFile.cpp
|
||||
VxMath/VxMath.cpp
|
||||
@ -73,6 +77,10 @@ FILES
|
||||
CK2/ObjImpls/CK3dObject.hpp
|
||||
CK2/ObjImpls/CKRenderObject.hpp
|
||||
CK2/ObjImpls/CKSceneObject.hpp
|
||||
CK2/ObjImpls/CKLight.hpp
|
||||
CK2/ObjImpls/CKTargetLight.hpp
|
||||
CK2/ObjImpls/CKCamera.hpp
|
||||
CK2/ObjImpls/CKTargetCamera.hpp
|
||||
# VxMath
|
||||
VxMath/VxTypes.hpp
|
||||
VxMath/VxMath.hpp
|
||||
|
@ -34,6 +34,10 @@
|
||||
#include "CK2/ObjImpls/CKTexture.hpp"
|
||||
#include "CK2/ObjImpls/CKMaterial.hpp"
|
||||
#include "CK2/ObjImpls/CKMesh.hpp"
|
||||
#include "CK2/ObjImpls/CKLight.hpp"
|
||||
#include "CK2/ObjImpls/CKTargetLight.hpp"
|
||||
#include "CK2/ObjImpls/CKCamera.hpp"
|
||||
#include "CK2/ObjImpls/CKTargetCamera.hpp"
|
||||
|
||||
// CK2 Managers
|
||||
#include "CK2/MgrImpls/CKBaseManager.hpp"
|
||||
|
@ -36,7 +36,7 @@ namespace LibCmo::EncodingHelper {
|
||||
* In underlying implementation, it actually is \c nullptr.
|
||||
* Because EncodingToken is just a raw pointer.
|
||||
*/
|
||||
constexpr EncodingToken INVALID_ENCODING_TOKEN = nullptr;
|
||||
inline constexpr EncodingToken INVALID_ENCODING_TOKEN = nullptr;
|
||||
|
||||
/**
|
||||
* @brief Create encoding token by given universal encoding name.
|
||||
|
@ -4,9 +4,9 @@
|
||||
* \file
|
||||
* The top header file for LibCom self development.
|
||||
* Every C++ header or source file located in this project should include this first
|
||||
* except the headers including this file.
|
||||
* except the headers included in this file.
|
||||
* The header files included by this header should be carefully managed,
|
||||
* to make sure there are no include loop and each header files can works correctly.
|
||||
* to make sure there are no include loop and each header files can work correctly.
|
||||
*
|
||||
* This header should only be used as internal header file.
|
||||
* It only contains all necessary stuff used by this project self.
|
||||
@ -17,7 +17,7 @@
|
||||
* So they will use native type, not CK type for declaration and implementation.
|
||||
* Take VTEncoding.hpp for example, All string used in it is \c std::u8string, not LibCmo::XContainer::XString.
|
||||
* The file starts with \c CK, \c Vx, and \c X is a part of Virtools SDK.
|
||||
* They should use Virtools type anywhere, except that Virtools type can not fulfill their requirement.
|
||||
* They should use Virtools type anywhere, except that Virtools type can not fulfill their requirements.
|
||||
*/
|
||||
|
||||
// The base header of LibCmo.
|
||||
|
Loading…
Reference in New Issue
Block a user