Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
0745f8c8
Commit
0745f8c8
authored
4 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix cmake bug
parent
956a7ba4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/cmake/Copy3rdPartyLibs.cmake
+1
-1
1 addition, 1 deletion
indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/Linking.cmake
+3
-0
3 additions, 0 deletions
indra/cmake/Linking.cmake
with
4 additions
and
1 deletion
indra/cmake/Copy3rdPartyLibs.cmake
+
1
−
1
View file @
0745f8c8
...
@@ -18,7 +18,7 @@ if(WINDOWS)
...
@@ -18,7 +18,7 @@ if(WINDOWS)
#*******************************
#*******************************
# VIVOX - *NOTE: no debug version
# VIVOX - *NOTE: no debug version
set
(
vivox_lib_dir
"
${
ARCH_PREBUILT_DIRS_RELEASE
}
"
)
set
(
vivox_lib_dir
"
${
ARCH_PREBUILT_DIRS_RELEASE
}
"
)
set
(
slvoice_src_dir
"
${
ARCH_PREBUILT_BIN_RELEASE
}
"
)
set
(
slvoice_src_dir
"
${
ARCH_PREBUILT_BIN_
DIRS_
RELEASE
}
"
)
set
(
slvoice_files SLVoice.exe
)
set
(
slvoice_files SLVoice.exe
)
if
(
ADDRESS_SIZE EQUAL 64
)
if
(
ADDRESS_SIZE EQUAL 64
)
list
(
APPEND vivox_libs
list
(
APPEND vivox_libs
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/Linking.cmake
+
3
−
0
View file @
0745f8c8
...
@@ -9,6 +9,9 @@ set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
...
@@ -9,6 +9,9 @@ set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
set
(
ARCH_PREBUILT_DIRS_PLUGINS
${
AUTOBUILD_INSTALL_DIR
}
/plugins
)
set
(
ARCH_PREBUILT_DIRS_PLUGINS
${
AUTOBUILD_INSTALL_DIR
}
/plugins
)
set
(
ARCH_PREBUILT_DIRS_RELEASE
${
AUTOBUILD_INSTALL_DIR
}
/lib/release
)
set
(
ARCH_PREBUILT_DIRS_RELEASE
${
AUTOBUILD_INSTALL_DIR
}
/lib/release
)
set
(
ARCH_PREBUILT_DIRS_DEBUG
${
AUTOBUILD_INSTALL_DIR
}
/lib/debug
)
set
(
ARCH_PREBUILT_DIRS_DEBUG
${
AUTOBUILD_INSTALL_DIR
}
/lib/debug
)
set
(
ARCH_PREBUILT_BIN_DIRS
${
AUTOBUILD_INSTALL_DIR
}
/bin
)
set
(
ARCH_PREBUILT_BIN_DIRS_RELEASE
${
AUTOBUILD_INSTALL_DIR
}
/bin/release
)
set
(
ARCH_PREBUILT_BIN_DIRS_DEBUG
${
AUTOBUILD_INSTALL_DIR
}
/bin/debug
)
if
(
WINDOWS
)
if
(
WINDOWS
)
set
(
SHARED_LIB_STAGING_DIR
${
CMAKE_BINARY_DIR
}
/sharedlibs
)
set
(
SHARED_LIB_STAGING_DIR
${
CMAKE_BINARY_DIR
}
/sharedlibs
)
set
(
EXE_STAGING_DIR
${
CMAKE_BINARY_DIR
}
/sharedlibs
)
set
(
EXE_STAGING_DIR
${
CMAKE_BINARY_DIR
}
/sharedlibs
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment